svn commit: r1424145 - in /accumulo/branches/1.4: ./ src/ src/core/ src/server/ src/server/src/main/java/org/apache/accumulo/server/trace/TraceServer.java

[ecn]

Author: ecn
Date: Wed Dec 19 21:26:06 2012
New Revision: 1424145

URL: http://svn.apache.org/viewvc?rev=1424145&view=rev
Log:
ACCUMULO-848 tracer has the same issue as the logger (stupid cut-n-paste)

Modified:
    accumulo/branches/1.4/   (props changed)
    accumulo/branches/1.4/src/   (props changed)
    accumulo/branches/1.4/src/core/   (props changed)
    accumulo/branches/1.4/src/server/   (props changed)
    
accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/trace/TraceServer.java

Propchange: accumulo/branches/1.4/
------------------------------------------------------------------------------
  Merged /accumulo/trunk/src:r1424115
  Merged /accumulo/trunk:r1424099,1424115

Propchange: accumulo/branches/1.4/src/
------------------------------------------------------------------------------
  Merged /accumulo/trunk/src:r1424099,1424115
  Merged /accumulo/trunk:r1424115

Propchange: accumulo/branches/1.4/src/core/
------------------------------------------------------------------------------
  Merged /accumulo/trunk/src/core:r1424099,1424115
  Merged /accumulo/trunk/core:r1424115

Propchange: accumulo/branches/1.4/src/server/
------------------------------------------------------------------------------
  Merged /accumulo/trunk/src/server:r1424099,1424115
  Merged /accumulo/trunk/server:r1424115

Modified: 
accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/trace/TraceServer.java
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/trace/TraceServer.java?rev=1424145&r1=1424144&r2=1424145&view=diff
==============================================================================
--- 
accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/trace/TraceServer.java
 (original)
+++ 
accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/trace/TraceServer.java
 Wed Dec 19 21:26:06 2012
@@ -230,12 +230,20 @@ public class TraceServer implements Watc
   public void process(WatchedEvent event) {
     log.debug("event " + event.getPath() + " " + event.getType() + " " + 
event.getState());
     if (event.getState() == KeeperState.Expired) {
-      log.warn("Logger lost zookeeper registration at " + event.getPath());
+      log.warn("Trace server lost zookeeper registration at " + 
event.getPath());
       server.stop();
     } else if (event.getType() == EventType.NodeDeleted) {
-      log.warn("Logger zookeeper entry lost " + event.getPath());
+      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);
+    }
+    log.warn("Trace server unable to reset watch on zookeeper registration");
+    server.stop();
   }
   
 }