Author: ecn
Date: Fri Apr 12 16:49:50 2013
New Revision: 1467351
URL: http://svn.apache.org/r1467351
Log:
ACCUMULO-1264 fix edge case when looking at the root tablet
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/state/MergeStats.java
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/util/Initialize.java
accumulo/trunk/src/ (props changed)
accumulo/trunk/test/src/test/java/org/apache/accumulo/test/MetaSplitTest.java
Propchange: accumulo/trunk/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5:r1467348,1467350
Propchange: accumulo/trunk/assemble/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/assemble:r1467348,1467350
Propchange: accumulo/trunk/core/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/core:r1467348,1467350
Propchange: accumulo/trunk/examples/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/examples:r1467348,1467350
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:r1467348,1467350
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:r1467348,1467350
Propchange: accumulo/trunk/pom.xml
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/pom.xml:r1467348,1467350
Propchange: accumulo/trunk/server/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/server:r1467348,1467350
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=1467351&r1=1467350&r2=1467351&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
Fri Apr 12 16:49:50 2013
@@ -64,6 +64,8 @@ public class MergeStats {
}
public void update(KeyExtent ke, TabletState state, boolean chopped, boolean
hasWALs) {
+ if (ke.isRootTablet())
+ return;
if (info.getState().equals(MergeState.NONE))
return;
if (!upperSplit && info.getRange().getEndRow().equals(ke.getPrevEndRow()))
{
@@ -105,11 +107,6 @@ public class MergeStats {
log.info("failed to see any tablets for this range, ignoring " +
info.getRange());
return state;
}
- if (total == 1 && info.getRange().isMeta()) {
- // root tablet watcher trying to merge metadata tablets it won't even
scan
- log.debug("ignoring merge of " + 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/util/Initialize.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/util/Initialize.java?rev=1467351&r1=1467350&r2=1467351&view=diff
==============================================================================
---
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/util/Initialize.java
(original)
+++
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/util/Initialize.java
Fri Apr 12 16:49:50 2013
@@ -407,7 +407,7 @@ public class Initialize {
return opts.cliUser;
}
String rootuser;
- rootuser = getConsoleReader().readLine("Enter name for initial root user (
" + DEFAULT_ROOT_USER + "): ", '*');
+ rootuser = getConsoleReader().readLine("Enter name for initial root user
(" + DEFAULT_ROOT_USER + "): ", '*');
if (rootuser == null)
System.exit(0);
if (rootuser.equals(""))
Propchange: accumulo/trunk/src/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/src:r1467348,1467350
Modified:
accumulo/trunk/test/src/test/java/org/apache/accumulo/test/MetaSplitTest.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/test/src/test/java/org/apache/accumulo/test/MetaSplitTest.java?rev=1467351&r1=1467350&r2=1467351&view=diff
==============================================================================
---
accumulo/trunk/test/src/test/java/org/apache/accumulo/test/MetaSplitTest.java
(original)
+++
accumulo/trunk/test/src/test/java/org/apache/accumulo/test/MetaSplitTest.java
Fri Apr 12 16:49:50 2013
@@ -63,7 +63,7 @@ public class MetaSplitTest {
opts.addSplits(Constants.METADATA_TABLE_NAME, splits);
}
- @Test(timeout = 60000)
+ @Test(timeout = 30000)
public void testMetaSplit() throws Exception {
Instance instance = new ZooKeeperInstance(cluster.getInstanceName(),
cluster.getZooKeepers());
Connector connector = instance.getConnector("root", new
PasswordToken(secret));
@@ -71,6 +71,7 @@ public class MetaSplitTest {
for (int i = 1; i <= 10; i++) {
opts.create("" + i);
}
+ opts.merge(Constants.METADATA_TABLE_NAME, new Text("01"), new Text("02"));
assertEquals(2, opts.listSplits(Constants.METADATA_TABLE_NAME).size());
addSplits(opts, "4 5 6 7 8".split(" "));
assertEquals(7, opts.listSplits(Constants.METADATA_TABLE_NAME).size());
