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/03/12 17:47:51 UTC
svn commit: r1455611 - in /accumulo/branches/1.4.3: ./ src/ src/core/
src/server/ src/server/src/
src/server/src/main/java/org/apache/accumulo/server/test/functional/
src/server/src/main/java/org/apache/accumulo/server/trace/
src/server/src/main/java/o...
Author: ecn
Date: Tue Mar 12 16:47:51 2013
New Revision: 1455611
URL: http://svn.apache.org/r1455611
Log:
ACCUMULO-1173 disconnect events do not set a path
Modified:
accumulo/branches/1.4.3/ (props changed)
accumulo/branches/1.4.3/CHANGES
accumulo/branches/1.4.3/src/ (props changed)
accumulo/branches/1.4.3/src/core/ (props changed)
accumulo/branches/1.4.3/src/server/ (props changed)
accumulo/branches/1.4.3/src/server/src/ (props changed)
accumulo/branches/1.4.3/src/server/src/main/java/org/apache/accumulo/server/test/functional/ (props changed)
accumulo/branches/1.4.3/src/server/src/main/java/org/apache/accumulo/server/trace/TraceServer.java
accumulo/branches/1.4.3/src/server/src/main/java/org/apache/accumulo/server/zookeeper/ZooLock.java (props changed)
Propchange: accumulo/branches/1.4.3/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.4:r1455610
Modified: accumulo/branches/1.4.3/CHANGES
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4.3/CHANGES?rev=1455611&r1=1455610&r2=1455611&view=diff
==============================================================================
--- accumulo/branches/1.4.3/CHANGES (original)
+++ accumulo/branches/1.4.3/CHANGES Tue Mar 12 16:47:51 2013
@@ -23,6 +23,7 @@ Release Notes - Apache Accumulo - Versio
* [ACCUMULO-872] - both accumulo and accumulo-native contain native libs
* [ACCUMULO-776] - TimestampFilter should serialize start and end as longs in the IteratorSetting
* [ACCUMULO-364] - Security Policy file should be an example
+ * [ACCUMULO-1173] - NPE in tracer on zookeeper disconnect
**Improvement
* [ACCUMULO-1049] - Master does not need to get tserver lock
Propchange: accumulo/branches/1.4.3/src/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.4/src:r1455610
Propchange: accumulo/branches/1.4.3/src/core/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.4/src/core:r1455610
Propchange: accumulo/branches/1.4.3/src/server/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.4/src/server:r1455610
Propchange: accumulo/branches/1.4.3/src/server/src/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.4/src/server/src:r1455610
Propchange: accumulo/branches/1.4.3/src/server/src/main/java/org/apache/accumulo/server/test/functional/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/test/functional:r1455610
Modified: accumulo/branches/1.4.3/src/server/src/main/java/org/apache/accumulo/server/trace/TraceServer.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4.3/src/server/src/main/java/org/apache/accumulo/server/trace/TraceServer.java?rev=1455611&r1=1455610&r2=1455611&view=diff
==============================================================================
--- accumulo/branches/1.4.3/src/server/src/main/java/org/apache/accumulo/server/trace/TraceServer.java (original)
+++ accumulo/branches/1.4.3/src/server/src/main/java/org/apache/accumulo/server/trace/TraceServer.java Tue Mar 12 16:47:51 2013
@@ -236,14 +236,16 @@ public class TraceServer implements Watc
log.warn("Trace server zookeeper entry lost " + event.getPath());
server.stop();
}
- try {
- if (ZooReaderWriter.getInstance().exists(event.getPath(), this))
- return;
- } catch (Exception ex) {
- log.error(ex, ex);
+ if (event.getPath() != null) {
+ try {
+ if (ZooReaderWriter.getInstance().exists(event.getPath(), this))
+ return;
+ } catch (Exception ex) {
+ log.error(ex, ex);
+ }
+ log.warn("Trace server unable to reset watch on zookeeper registration");
+ server.stop();
}
- log.warn("Trace server unable to reset watch on zookeeper registration");
- server.stop();
}
}
Propchange: accumulo/branches/1.4.3/src/server/src/main/java/org/apache/accumulo/server/zookeeper/ZooLock.java
------------------------------------------------------------------------------
Merged /accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/zookeeper/ZooLock.java:r1455610