You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ec...@apache.org on 2013/02/20 21:42:45 UTC
svn commit: r1448388 - in /accumulo/trunk: ./ assemble/ core/ examples/
fate/src/main/java/org/apache/accumulo/fate/
fate/src/main/java/org/apache/accumulo/fate/zookeeper/ server/
server/src/main/java/org/apache/accumulo/server/master/ src/
Author: ecn
Date: Wed Feb 20 20:42:45 2013
New Revision: 1448388
URL: http://svn.apache.org/r1448388
Log:
ACCUMULO-1053 merge in changes to 1.5 branch
Modified:
accumulo/trunk/ (props changed)
accumulo/trunk/assemble/ (props changed)
accumulo/trunk/core/ (props changed)
accumulo/trunk/examples/ (props changed)
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java (props changed)
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java (props changed)
accumulo/trunk/server/ (props changed)
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java
accumulo/trunk/src/ (props changed)
Propchange: accumulo/trunk/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5:r1447769-1447844,1447846-1447848,1447850-1447978,1447980-1448314,1448335-1448387
Propchange: accumulo/trunk/assemble/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/assemble:r1447769-1447844,1447846-1447848,1447850-1447978,1447980-1448314,1448335-1448387
Propchange: accumulo/trunk/core/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/core:r1447769-1447844,1447846-1447848,1447850-1447978,1447980-1448314,1448335-1448387
Propchange: accumulo/trunk/examples/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/examples:r1447769-1447844,1447846-1447848,1447850-1447978,1447980-1448314,1448335-1448387
Propchange: accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1447769-1447844,1447846-1447848,1447850-1447978,1447980-1448314,1448335-1448387
Propchange: accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1447769-1447844,1447846-1447848,1447850-1447978,1447980-1448314,1448335-1448387
Propchange: accumulo/trunk/server/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/server:r1447769-1447844,1447846-1447848,1447850-1447978,1447980-1448314,1448335-1448387
Modified: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java?rev=1448388&r1=1448387&r2=1448388&view=diff
==============================================================================
--- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java (original)
+++ accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java Wed Feb 20 20:42:45 2013
@@ -277,10 +277,14 @@ public class LiveTServerSet implements W
if (info == null) {
updates.add(instance);
current.put(server, new TServerInfo(instance, new TServerConnection(addr)));
+ if (server.startsWith("/"))
+ log.error(server, new Throwable());
} else if (!info.instance.equals(instance)) {
doomed.add(info.instance);
updates.add(instance);
current.put(server, new TServerInfo(instance, new TServerConnection(addr)));
+ if (server.startsWith("/"))
+ log.error(server, new Throwable());
}
}
}
Propchange: accumulo/trunk/src/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/src:r1447769-1447844,1447846-1447848,1447850-1447978,1447980-1448314,1448335-1448387