You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by ma...@apache.org on 2012/02/06 10:49:20 UTC
svn commit: r1240951 - in /zookeeper/branches/branch-3.4: CHANGES.txt
src/java/main/org/apache/zookeeper/server/DataTree.java
src/java/main/org/apache/zookeeper/server/PrepRequestProcessor.java
Author: mahadev
Date: Mon Feb 6 09:49:20 2012
New Revision: 1240951
URL: http://svn.apache.org/viewvc?rev=1240951&view=rev
Log:
ZOOKEEPER-1340. multi problem - typical user operations are generating ERROR level messages in the server (phunt via mahadev)
Modified:
zookeeper/branches/branch-3.4/CHANGES.txt
zookeeper/branches/branch-3.4/src/java/main/org/apache/zookeeper/server/DataTree.java
zookeeper/branches/branch-3.4/src/java/main/org/apache/zookeeper/server/PrepRequestProcessor.java
Modified: zookeeper/branches/branch-3.4/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/CHANGES.txt?rev=1240951&r1=1240950&r2=1240951&view=diff
==============================================================================
--- zookeeper/branches/branch-3.4/CHANGES.txt (original)
+++ zookeeper/branches/branch-3.4/CHANGES.txt Mon Feb 6 09:49:20 2012
@@ -35,12 +35,15 @@ BUGFIXES:
ZOOKEEPER-1336. javadoc for multi is confusing, references functionality that doesn't
seem to exist (phunt via mahadev)
+ ZOOKEEPER-1340. multi problem - typical user operations are
+ generating ERROR level messages in the server (phunt via mahadev)
+
IMPROVEMENTS:
- ZOOKEEPER-1322. Cleanup/fix logging in Quorum code. (phunt via mahadev)
-
- ZOOKEEPER-1327. there are still remnants of hadoop urls.
- (Harsh J via mahadev)
+ ZOOKEEPER-1322. Cleanup/fix logging in Quorum code. (phunt via mahadev)
+
+ ZOOKEEPER-1327. there are still remnants of hadoop urls.
+ (Harsh J via mahadev)
Release 3.4.2 - 2011-12-21
Modified: zookeeper/branches/branch-3.4/src/java/main/org/apache/zookeeper/server/DataTree.java
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/src/java/main/org/apache/zookeeper/server/DataTree.java?rev=1240951&r1=1240950&r2=1240951&view=diff
==============================================================================
--- zookeeper/branches/branch-3.4/src/java/main/org/apache/zookeeper/server/DataTree.java (original)
+++ zookeeper/branches/branch-3.4/src/java/main/org/apache/zookeeper/server/DataTree.java Mon Feb 6 09:49:20 2012
@@ -902,10 +902,10 @@ public class DataTree {
break;
}
} catch (KeeperException e) {
- LOG.warn("Failed: " + debug, e);
- rc.err = e.code().intValue();
+ LOG.debug("Failed: " + debug, e);
+ rc.err = e.code().intValue();
} catch (IOException e) {
- LOG.warn("Failed:" + debug, e);
+ LOG.debug("Failed:" + debug, e);
}
/*
* A snapshot might be in progress while we are modifying the data
Modified: zookeeper/branches/branch-3.4/src/java/main/org/apache/zookeeper/server/PrepRequestProcessor.java
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/src/java/main/org/apache/zookeeper/server/PrepRequestProcessor.java?rev=1240951&r1=1240950&r2=1240951&view=diff
==============================================================================
--- zookeeper/branches/branch-3.4/src/java/main/org/apache/zookeeper/server/PrepRequestProcessor.java (original)
+++ zookeeper/branches/branch-3.4/src/java/main/org/apache/zookeeper/server/PrepRequestProcessor.java Mon Feb 6 09:49:20 2012
@@ -561,11 +561,11 @@ public class PrepRequestProcessor extend
}
request.hdr.setType(OpCode.error);
request.txn = new ErrorTxn(e.code().intValue());
- LOG.error(">>>> Got user-level KeeperException when processing "
- + request.toString()
- + " Error Path:" + e.getPath()
- + " Error:" + e.getMessage());
- LOG.error(">>>> ABORTING remaing MultiOp ops");
+ LOG.info("Got user-level KeeperException when processing "
+ + request.toString() + " aborting remaining multi ops."
+ + " Error Path:" + e.getPath()
+ + " Error:" + e.getMessage());
+
request.setException(e);
/* Rollback change records from failed multi-op */