Author: mahadev Date: Fri Jun 26 21:15:58 2009 New Revision: 788872 URL: http://svn.apache.org/viewvc?rev=788872&view=rev Log: ZOOKEEPER-449. sesssionmoved in java code and ZCLOSING in C have the same value. (mahadev)
Modified: hadoop/zookeeper/trunk/CHANGES.txt hadoop/zookeeper/trunk/src/c/include/zookeeper.h hadoop/zookeeper/trunk/src/c/src/zookeeper.c hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/KeeperException.java Modified: hadoop/zookeeper/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/CHANGES.txt?rev=788872&r1=788871&r2=788872&view=diff ============================================================================== --- hadoop/zookeeper/trunk/CHANGES.txt (original) +++ hadoop/zookeeper/trunk/CHANGES.txt Fri Jun 26 21:15:58 2009 @@ -136,6 +136,9 @@ ZOOKEEPER-417. stray message problem when changing servers (breed via mahadev) + ZOOKEEPER-449. sesssionmoved in java code and ZCLOSING in C have the same +value. (mahadev) + IMPROVEMENTS: ZOOKEEPER-308. improve the atomic broadcast performance 3x. (breed via mahadev) Modified: hadoop/zookeeper/trunk/src/c/include/zookeeper.h URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/c/include/zookeeper.h?rev=788872&r1=788871&r2=788872&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/c/include/zookeeper.h (original) +++ hadoop/zookeeper/trunk/src/c/include/zookeeper.h Fri Jun 26 21:15:58 2009 @@ -106,7 +106,8 @@ ZINVALIDACL = -114, /*!< Invalid ACL specified */ ZAUTHFAILED = -115, /*!< Client authentication failed */ ZCLOSING = -116, /*!< ZooKeeper is closing */ - ZNOTHING = -117 /*!< (not error) no server responses to process */ + ZNOTHING = -117, /*!< (not error) no server responses to process */ + ZSESSIONMOVED = -118 /*!<session moved to another server, so operation is ignored */ }; #ifdef __cplusplus Modified: hadoop/zookeeper/trunk/src/c/src/zookeeper.c URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/c/src/zookeeper.c?rev=788872&r1=788871&r2=788872&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/c/src/zookeeper.c (original) +++ hadoop/zookeeper/trunk/src/c/src/zookeeper.c Fri Jun 26 21:15:58 2009 @@ -2638,6 +2638,8 @@ return "zookeeper is closing"; case ZNOTHING: return "(not error) no server responses to process"; + case ZSESSIONMOVED: + return "session moved to another server, so operation is ignored"; } if (c > 0) { return strerror(c); Modified: hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/KeeperException.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/KeeperException.java?rev=788872&r1=788871&r2=788872&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/KeeperException.java (original) +++ hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/KeeperException.java Fri Jun 26 21:15:58 2009 @@ -269,7 +269,7 @@ /** * This value will be used directly in {...@link CODE#SESSIONMOVED} */ - // public static final int SessionMoved = -116; + // public static final int SessionMoved = -118; } /** Codes which represent the various KeeperException @@ -332,7 +332,7 @@ /** Client authentication failed */ AUTHFAILED (AuthFailed), /** Session moved to another server, so operation is ignored */ - SESSIONMOVED (-116); + SESSIONMOVED (-118); private static final Map<Integer,Code> lookup = new HashMap<Integer,Code>();