Author: ecn
Date: Mon Apr 22 19:52:00 2013
New Revision: 1470685
URL: http://svn.apache.org/r1470685
Log:
ACCUMULO-1211 new format breaks functional test
Modified:
accumulo/trunk/ (props changed)
accumulo/trunk/assemble/ (props changed)
accumulo/trunk/core/ (props changed)
accumulo/trunk/examples/ (props changed)
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
(props changed)
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
(props changed)
accumulo/trunk/pom.xml (props changed)
accumulo/trunk/server/ (props changed)
accumulo/trunk/src/ (props changed)
accumulo/trunk/test/system/auto/simple/simpleBalancer.py
Propchange: accumulo/trunk/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5:r1470684
Propchange: accumulo/trunk/assemble/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/assemble:r1470684
Propchange: accumulo/trunk/core/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/core:r1470684
Propchange: accumulo/trunk/examples/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/examples:r1470684
Propchange:
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
------------------------------------------------------------------------------
Merged
/accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1470684
Propchange:
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
------------------------------------------------------------------------------
Merged
/accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1470684
Propchange: accumulo/trunk/pom.xml
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/pom.xml:r1470684
Propchange: accumulo/trunk/server/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/server:r1470684
Propchange: accumulo/trunk/src/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/src:r1470684
Modified: accumulo/trunk/test/system/auto/simple/simpleBalancer.py
URL:
http://svn.apache.org/viewvc/accumulo/trunk/test/system/auto/simple/simpleBalancer.py?rev=1470685&r1=1470684&r2=1470685&view=diff
==============================================================================
--- accumulo/trunk/test/system/auto/simple/simpleBalancer.py (original)
+++ accumulo/trunk/test/system/auto/simple/simpleBalancer.py Mon Apr 22
19:52:00 2013
@@ -89,12 +89,12 @@ class SimpleBalancerFairness(SunnyDayTes
# will be split evenly on both servers, not just one
table = ''
for line in out.split('\n'):
- if line.find(' Name ') == 0:
- server = line[6:]
+ if line.find(' Name: ') == 0:
+ server = line[7:]
servers.setdefault(server, 0)
- if line.find('Table ') >= 0:
+ if line.find('Table: ') >= 0:
table = line.split(' ')[-1]
- if line.find(' Tablets ') == 0:
+ if line.find(' Tablets: ') == 0:
if table == '1':
servers[server] += int(line.split()[-1])
log.info("Tablet counts " + repr(servers))
