You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by kf...@apache.org on 2015/01/20 03:23:22 UTC
svn commit: r1653183 - in
/tomcat/trunk/java/org/apache/catalina/tribes/tipis:
AbstractReplicatedMap.java LazyReplicatedMap.java ReplicatedMap.java
Author: kfujino
Date: Tue Jan 20 02:23:21 2015
New Revision: 1653183
URL: http://svn.apache.org/r1653183
Log:
ReplicatedMap should send the Copy message when replicating.
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
tomcat/trunk/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java
tomcat/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java
Modified: tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java?rev=1653183&r1=1653182&r2=1653183&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java Tue Jan 20 02:23:21 2015
@@ -75,6 +75,8 @@ public abstract class AbstractReplicated
protected abstract int getStateMessageType();
+ protected abstract int getRplicateMessageType();
+
/**
* Timeout for RPC messages, how long we will wait for a reply
@@ -426,7 +428,7 @@ public abstract class AbstractReplicated
rentry.lock();
try {
//construct a diff message
- msg = new MapMessage(mapContextName, MapMessage.MSG_BACKUP,
+ msg = new MapMessage(mapContextName, getRplicateMessageType(),
true, (Serializable) entry.getKey(), null,
rentry.getDiff(),
entry.getPrimary(),
@@ -440,7 +442,7 @@ public abstract class AbstractReplicated
}
if (msg == null && complete) {
//construct a complete
- msg = new MapMessage(mapContextName, MapMessage.MSG_BACKUP,
+ msg = new MapMessage(mapContextName, getRplicateMessageType(),
false, (Serializable) entry.getKey(),
(Serializable) entry.getValue(),
null, entry.getPrimary(),entry.getBackupNodes());
Modified: tomcat/trunk/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java?rev=1653183&r1=1653182&r2=1653183&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java Tue Jan 20 02:23:21 2015
@@ -124,6 +124,11 @@ public class LazyReplicatedMap<K,V> exte
return AbstractReplicatedMap.MapMessage.MSG_STATE;
}
+ @Override
+ protected int getRplicateMessageType() {
+ return AbstractReplicatedMap.MapMessage.MSG_BACKUP;
+ }
+
/**
* publish info about a map pair (key/value) to other nodes in the cluster
* @param key Object
Modified: tomcat/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java?rev=1653183&r1=1653182&r2=1653183&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java Tue Jan 20 02:23:21 2015
@@ -105,6 +105,11 @@ public class ReplicatedMap<K,V> extends
return AbstractReplicatedMap.MapMessage.MSG_STATE_COPY;
}
+ @Override
+ protected int getRplicateMessageType() {
+ return AbstractReplicatedMap.MapMessage.MSG_COPY;
+ }
+
/**
* publish info about a map pair (key/value) to other nodes in the cluster
* @param key Object
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r1653183 - in /tomcat/trunk/java/org/apache/catalina/tribes/tipis:
AbstractReplicatedMap.java LazyReplicatedMap.java ReplicatedMap.java
Posted by Keiichi Fujino <kf...@apache.org>.
2015-01-20 14:39 GMT+09:00 Felix Schumacher <
felix.schumacher@internetallee.de>:
>
>
> Am 20. Januar 2015 03:23:22 MEZ, schrieb kfujino@apache.org:
> >Author: kfujino
> >Date: Tue Jan 20 02:23:21 2015
> >New Revision: 1653183
> >
> >URL: http://svn.apache.org/r1653183
> >Log:
> >ReplicatedMap should send the Copy message when replicating.
> >
> >Modified:
>
> >tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
> >tomcat/trunk/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java
> > tomcat/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java
> >
> >Modified:
>
> >tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
> >URL:
> >
> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java?rev=1653183&r1=1653182&r2=1653183&view=diff
>
> >==============================================================================
> >---
>
> >tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
> >(original)
> >+++
>
> >tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
> >Tue Jan 20 02:23:21 2015
> >@@ -75,6 +75,8 @@ public abstract class AbstractReplicated
> >
> > protected abstract int getStateMessageType();
> >
> >+ protected abstract int getRplicateMessageType();
>
> I think you wanted to type getR*e*plicateMessageType.
>
> Regards
> Felix
>
>
Thanks .
>
> --
> Keiichi.Fujino
> <de...@tomcat.apache.org>
> <de...@tomcat.apache.org>
>
Re: svn commit: r1653183 - in /tomcat/trunk/java/org/apache/catalina/tribes/tipis: AbstractReplicatedMap.java LazyReplicatedMap.java ReplicatedMap.java
Posted by Felix Schumacher <fe...@internetallee.de>.
Am 20. Januar 2015 03:23:22 MEZ, schrieb kfujino@apache.org:
>Author: kfujino
>Date: Tue Jan 20 02:23:21 2015
>New Revision: 1653183
>
>URL: http://svn.apache.org/r1653183
>Log:
>ReplicatedMap should send the Copy message when replicating.
>
>Modified:
>tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
>tomcat/trunk/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java
> tomcat/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java
>
>Modified:
>tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
>URL:
>http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java?rev=1653183&r1=1653182&r2=1653183&view=diff
>==============================================================================
>---
>tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
>(original)
>+++
>tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
>Tue Jan 20 02:23:21 2015
>@@ -75,6 +75,8 @@ public abstract class AbstractReplicated
>
> protected abstract int getStateMessageType();
>
>+ protected abstract int getRplicateMessageType();
I think you wanted to type getR*e*plicateMessageType.
Regards
Felix
>+
>
> /**
> * Timeout for RPC messages, how long we will wait for a reply
>@@ -426,7 +428,7 @@ public abstract class AbstractReplicated
> rentry.lock();
> try {
> //construct a diff message
>- msg = new MapMessage(mapContextName,
>MapMessage.MSG_BACKUP,
>+ msg = new MapMessage(mapContextName,
>getRplicateMessageType(),
> true, (Serializable) entry.getKey(), null,
> rentry.getDiff(),
> entry.getPrimary(),
>@@ -440,7 +442,7 @@ public abstract class AbstractReplicated
> }
> if (msg == null && complete) {
> //construct a complete
>- msg = new MapMessage(mapContextName,
>MapMessage.MSG_BACKUP,
>+ msg = new MapMessage(mapContextName,
>getRplicateMessageType(),
> false, (Serializable) entry.getKey(),
> (Serializable) entry.getValue(),
> null, entry.getPrimary(),entry.getBackupNodes());
>
>Modified:
>tomcat/trunk/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java
>URL:
>http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java?rev=1653183&r1=1653182&r2=1653183&view=diff
>==============================================================================
>---
>tomcat/trunk/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java
>(original)
>+++
>tomcat/trunk/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java
>Tue Jan 20 02:23:21 2015
>@@ -124,6 +124,11 @@ public class LazyReplicatedMap<K,V> exte
> return AbstractReplicatedMap.MapMessage.MSG_STATE;
> }
>
>+ @Override
>+ protected int getRplicateMessageType() {
>+ return AbstractReplicatedMap.MapMessage.MSG_BACKUP;
>+ }
>+
> /**
>* publish info about a map pair (key/value) to other nodes in the
>cluster
> * @param key Object
>
>Modified:
>tomcat/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java
>URL:
>http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java?rev=1653183&r1=1653182&r2=1653183&view=diff
>==============================================================================
>---
>tomcat/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java
>(original)
>+++
>tomcat/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java
>Tue Jan 20 02:23:21 2015
>@@ -105,6 +105,11 @@ public class ReplicatedMap<K,V> extends
> return AbstractReplicatedMap.MapMessage.MSG_STATE_COPY;
> }
>
>+ @Override
>+ protected int getRplicateMessageType() {
>+ return AbstractReplicatedMap.MapMessage.MSG_COPY;
>+ }
>+
> /**
>* publish info about a map pair (key/value) to other nodes in the
>cluster
> * @param key Object
>
>
>
>---------------------------------------------------------------------
>To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
>For additional commands, e-mail: dev-help@tomcat.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org