You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by ca...@apache.org on 2012/03/17 16:17:11 UTC
svn commit: r1301947 - in /zookeeper/trunk: CHANGES.txt
src/java/main/org/apache/zookeeper/server/DataTree.java
Author: camille
Date: Sat Mar 17 15:17:11 2012
New Revision: 1301947
URL: http://svn.apache.org/viewvc?rev=1301947&view=rev
Log:
ZOOKEEPER-1390. some expensive debug code not protected by a check for debug (breed via camille)
Modified:
zookeeper/trunk/CHANGES.txt
zookeeper/trunk/src/java/main/org/apache/zookeeper/server/DataTree.java
Modified: zookeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/trunk/CHANGES.txt?rev=1301947&r1=1301946&r2=1301947&view=diff
==============================================================================
--- zookeeper/trunk/CHANGES.txt (original)
+++ zookeeper/trunk/CHANGES.txt Sat Mar 17 15:17:11 2012
@@ -151,7 +151,9 @@ BUGFIXES:
ZOOKEEPER-1307. zkCli.sh is exiting when an Invalid ACL exception is
thrown from setACL command through client (Kavita Sharma via phunt)
-
+
+ ZOOKEEPER-1390. some expensive debug code not protected by a check for debug (breed via camille)
+
IMPROVEMENTS:
ZOOKEEPER-1170. Fix compiler (eclipse) warnings: unused imports,
Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/server/DataTree.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/DataTree.java?rev=1301947&r1=1301946&r2=1301947&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/server/DataTree.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/server/DataTree.java Sat Mar 17 15:17:11 2012
@@ -724,7 +724,6 @@ public class DataTree {
{
ProcessTxnResult rc = new ProcessTxnResult();
- String debug = "";
try {
rc.clientId = header.getClientId();
rc.cxid = header.getCxid();
@@ -735,7 +734,6 @@ public class DataTree {
switch (header.getType()) {
case OpCode.create:
CreateTxn createTxn = (CreateTxn) txn;
- debug = "Create transaction for " + createTxn.getPath();
rc.path = createTxn.getPath();
createNode(
createTxn.getPath(),
@@ -747,15 +745,11 @@ public class DataTree {
break;
case OpCode.delete:
DeleteTxn deleteTxn = (DeleteTxn) txn;
- debug = "Delete transaction for " + deleteTxn.getPath();
rc.path = deleteTxn.getPath();
deleteNode(deleteTxn.getPath(), header.getZxid());
break;
case OpCode.setData:
SetDataTxn setDataTxn = (SetDataTxn) txn;
- debug = "Set data transaction for "
- + setDataTxn.getPath()
- + " to new value=" + Arrays.toString(setDataTxn.getData());
rc.path = setDataTxn.getPath();
rc.stat = setData(setDataTxn.getPath(), setDataTxn
.getData(), setDataTxn.getVersion(), header
@@ -763,8 +757,6 @@ public class DataTree {
break;
case OpCode.setACL:
SetACLTxn setACLTxn = (SetACLTxn) txn;
- debug = "Set ACL transaction for "
- + setACLTxn.getPath();
rc.path = setACLTxn.getPath();
rc.stat = setACL(setACLTxn.getPath(), setACLTxn.getAcl(),
setACLTxn.getVersion());
@@ -778,16 +770,11 @@ public class DataTree {
break;
case OpCode.check:
CheckVersionTxn checkTxn = (CheckVersionTxn) txn;
- debug = "Check Version transaction for "
- + checkTxn.getPath()
- + " and version="
- + checkTxn.getVersion();
rc.path = checkTxn.getPath();
break;
case OpCode.multi:
MultiTxn multiTxn = (MultiTxn) txn ;
List<Txn> txns = multiTxn.getTxns();
- debug = "Multi transaction with " + txns.size() + " operations";
rc.multiResult = new ArrayList<ProcessTxnResult>();
boolean failed = false;
for (Txn subtxn : txns) {
@@ -849,10 +836,14 @@ public class DataTree {
break;
}
} catch (KeeperException e) {
- LOG.debug("Failed: " + debug, e);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Failed: " + header + ":" + txn, e);
+ }
rc.err = e.code().intValue();
} catch (IOException e) {
- LOG.debug("Failed:" + debug, e);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Failed: " + header + ":" + txn, e);
+ }
}
/*
* A snapshot might be in progress while we are modifying the data