You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ec...@apache.org on 2013/04/22 19:03:56 UTC
svn commit: r1470619 - in /accumulo/trunk: ./ assemble/ core/ examples/
fate/src/main/java/org/apache/accumulo/fate/
fate/src/main/java/org/apache/accumulo/fate/zookeeper/ server/
server/src/main/java/org/apache/accumulo/server/master/ server/src/main/...
Author: ecn
Date: Mon Apr 22 17:03:55 2013
New Revision: 1470619
URL: http://svn.apache.org/r1470619
Log:
ACCUMULO-1319 fix functional tests
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/server/src/main/java/org/apache/accumulo/server/master/Master.java
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/state/MergeStats.java
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/state/MetaDataTableScanner.java
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/state/TabletStateChangeIterator.java
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/util/FindOfflineTablets.java
accumulo/trunk/src/ (props changed)
accumulo/trunk/test/system/auto/TestUtils.py
Propchange: accumulo/trunk/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5:r1469907,1470618
Propchange: accumulo/trunk/assemble/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/assemble:r1469907,1470618
Propchange: accumulo/trunk/core/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/core:r1469907,1470618
Propchange: accumulo/trunk/examples/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/examples:r1469907,1470618
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:r1469907,1470618
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:r1469907,1470618
Propchange: accumulo/trunk/pom.xml
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/pom.xml:r1469907,1470618
Propchange: accumulo/trunk/server/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/server:r1469907,1470618
Modified: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/Master.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/Master.java?rev=1470619&r1=1470618&r2=1470619&view=diff
==============================================================================
--- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/Master.java (original)
+++ accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/Master.java Mon Apr 22 17:03:55 2013
@@ -1047,6 +1047,12 @@ public class Master implements LiveTServ
}
}
+ public MergeInfo getMergeInfo(KeyExtent tablet) {
+ if (tablet.isRootTablet())
+ return new MergeInfo();
+ return getMergeInfo(tablet.getTableId());
+ }
+
public MergeInfo getMergeInfo(Text tableId) {
synchronized (mergeLock) {
try {
@@ -1320,7 +1326,7 @@ public class Master implements LiveTServ
Text tableId = tls.extent.getTableId();
MergeStats mergeStats = mergeStatsCache.get(tableId);
if (mergeStats == null) {
- mergeStatsCache.put(tableId, mergeStats = new MergeStats(getMergeInfo(tableId)));
+ mergeStatsCache.put(tableId, mergeStats = new MergeStats(getMergeInfo(tls.extent)));
}
TabletGoalState goal = getGoalState(tls, mergeStats.getMergeInfo());
TServerInstance server = tls.getServer();
@@ -1514,7 +1520,6 @@ public class Master implements LiveTServ
for (MergeStats stats : mergeStatsCache.values()) {
try {
MergeState update = stats.nextMergeState(getConnector(), Master.this);
-
// when next state is MERGING, its important to persist this before
// starting the merge... the verification check that is done before
// moving into the merging state could fail if merge starts but does
Modified: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/state/MergeStats.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/state/MergeStats.java?rev=1470619&r1=1470618&r2=1470619&view=diff
==============================================================================
--- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/state/MergeStats.java (original)
+++ accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/state/MergeStats.java Mon Apr 22 17:03:55 2013
@@ -99,14 +99,14 @@ public class MergeStats {
MergeState state = info.getState();
if (state == MergeState.NONE)
return state;
+ if (total == 0) {
+ log.trace("failed to see any tablets for this range, ignoring " + info.getRange());
+ return state;
+ }
log.info("Computing next merge state for " + info.getRange() + " which is presently " + state + " isDelete : " + info.isDelete());
if (state == MergeState.STARTED) {
state = MergeState.SPLITTING;
}
- if (total == 0) {
- log.info("failed to see any tablets for this range, ignoring " + info.getRange());
- return state;
- }
if (state == MergeState.SPLITTING) {
log.info(hosted + " are hosted, total " + total);
if (!info.isDelete() && total == 1) {
Modified: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/state/MetaDataTableScanner.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/state/MetaDataTableScanner.java?rev=1470619&r1=1470618&r2=1470619&view=diff
==============================================================================
--- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/state/MetaDataTableScanner.java (original)
+++ accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/state/MetaDataTableScanner.java Mon Apr 22 17:03:55 2013
@@ -112,6 +112,7 @@ public class MetaDataTableScanner implem
} catch (RuntimeException ex) {
// something is wrong with the records in the !METADATA table, just skip over it
log.error(ex, ex);
+ mdScanner.close();
return null;
}
}
Modified: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/state/TabletStateChangeIterator.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/state/TabletStateChangeIterator.java?rev=1470619&r1=1470618&r2=1470619&view=diff
==============================================================================
--- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/state/TabletStateChangeIterator.java (original)
+++ accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/state/TabletStateChangeIterator.java Mon Apr 22 17:03:55 2013
@@ -119,6 +119,8 @@ public class TabletStateChangeIterator e
TabletLocationState tls;
try {
tls = MetaDataTableScanner.createTabletLocationState(k, v);
+ if (tls == null)
+ return;
} catch (BadLocationStateException e) {
// maybe the master can do something with a tablet with bad/inconsistent state
return;
Modified: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/util/FindOfflineTablets.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/util/FindOfflineTablets.java?rev=1470619&r1=1470618&r2=1470619&view=diff
==============================================================================
--- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/util/FindOfflineTablets.java (original)
+++ accumulo/trunk/server/src/main/java/org/apache/accumulo/server/util/FindOfflineTablets.java Mon Apr 22 17:03:55 2013
@@ -65,7 +65,7 @@ public class FindOfflineTablets {
while (scanner.hasNext()) {
TabletLocationState locationState = scanner.next();
TabletState state = locationState.getState(tservers.getCurrentServers());
- if (state != TabletState.HOSTED && TableManager.getInstance().getTableState(locationState.extent.getTableId().toString()) != TableState.OFFLINE)
+ if (state != null && state != TabletState.HOSTED && TableManager.getInstance().getTableState(locationState.extent.getTableId().toString()) != TableState.OFFLINE)
if (!locationState.extent.equals(Constants.ROOT_TABLET_EXTENT))
System.out.println(locationState + " is " + state + " #walogs:" + locationState.walogs.size());
}
Propchange: accumulo/trunk/src/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/src:r1469907,1470618
Modified: accumulo/trunk/test/system/auto/TestUtils.py
URL: http://svn.apache.org/viewvc/accumulo/trunk/test/system/auto/TestUtils.py?rev=1470619&r1=1470618&r2=1470619&view=diff
==============================================================================
--- accumulo/trunk/test/system/auto/TestUtils.py (original)
+++ accumulo/trunk/test/system/auto/TestUtils.py Mon Apr 22 17:03:55 2013
@@ -275,7 +275,7 @@ class TestUtilsMixin:
self.wait(self.runOn(host,
['hadoop', 'fs', '-rmr', ACCUMULO_DIR]))
handle = self.runOn(host, [self.accumulo_sh(), 'init','--clear-instance-name'], stdin=PIPE)
- out, err = handle.communicate(INSTANCE_NAME+"\nroot\n"+ROOT_PASSWORD + "\n" + ROOT_PASSWORD+"\n")
+ out, err = handle.communicate(INSTANCE_NAME+"\n"+ROOT_PASSWORD + "\n" + ROOT_PASSWORD+"\n")
self.processResult(out, err, handle.returncode)
def setup_logging(self):