date:20130422

svn commit: r1470607 - /accumulo/branches/1.5/test/src/test/java/org/apache/accumulo/test/TestAccumuloSplitRecovery.java

2013-04-22 Thread kturner

Author: kturner
Date: Mon Apr 22 16:31:20 2013
New Revision: 1470607

URL: http://svn.apache.org/r1470607
Log:
ACCUMULO-1235 added timeout to split recovery unit test

Modified:

accumulo/branches/1.5/test/src/test/java/org/apache/accumulo/test/TestAccumuloSplitRecovery.java

Modified: 
accumulo/branches/1.5/test/src/test/java/org/apache/accumulo/test/TestAccumuloSplitRecovery.java
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/test/src/test/java/org/apache/accumulo/test/TestAccumuloSplitRecovery.java?rev=1470607r1=1470606r2=1470607view=diff
==
--- 
accumulo/branches/1.5/test/src/test/java/org/apache/accumulo/test/TestAccumuloSplitRecovery.java
 (original)
+++ 
accumulo/branches/1.5/test/src/test/java/org/apache/accumulo/test/TestAccumuloSplitRecovery.java
 Mon Apr 22 16:31:20 2013
@@ -78,7 +78,7 @@ public class TestAccumuloSplitRecovery {
 return true;
   }
   
-  @Test
+  @Test(timeout = 6)
   public void test() throws Exception {
 
 for (int tn = 0; tn  2; tn++) {

svn commit: r1470609 - in /accumulo/trunk: ./ assemble/ core/ examples/ fate/src/main/java/org/apache/accumulo/fate/ fate/src/main/java/org/apache/accumulo/fate/zookeeper/ server/ src/ test/src/test/j

2013-04-22 Thread kturner

Author: kturner
Date: Mon Apr 22 16:34:09 2013
New Revision: 1470609

URL: http://svn.apache.org/r1470609
Log:
ACCUMULO-1235 added timeout to split recovery unit 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/src/test/java/org/apache/accumulo/test/TestAccumuloSplitRecovery.java

Propchange: accumulo/trunk/
--
  Merged /accumulo/branches/1.5:r1470607

Propchange: accumulo/trunk/assemble/
--
  Merged /accumulo/branches/1.5/assemble:r1470607

Propchange: accumulo/trunk/core/
--
  Merged /accumulo/branches/1.5/core:r1470607

Propchange: accumulo/trunk/examples/
--
  Merged /accumulo/branches/1.5/examples:r1470607

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:r1470607

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:r1470607

Propchange: accumulo/trunk/pom.xml
--
  Merged /accumulo/branches/1.5/pom.xml:r1470607

Propchange: accumulo/trunk/server/
--
  Merged /accumulo/branches/1.5/server:r1470607

Propchange: accumulo/trunk/src/
--
  Merged /accumulo/branches/1.5/src:r1470607

Modified: 
accumulo/trunk/test/src/test/java/org/apache/accumulo/test/TestAccumuloSplitRecovery.java
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/test/src/test/java/org/apache/accumulo/test/TestAccumuloSplitRecovery.java?rev=1470609r1=1470608r2=1470609view=diff
==
--- 
accumulo/trunk/test/src/test/java/org/apache/accumulo/test/TestAccumuloSplitRecovery.java
 (original)
+++ 
accumulo/trunk/test/src/test/java/org/apache/accumulo/test/TestAccumuloSplitRecovery.java
 Mon Apr 22 16:34:09 2013
@@ -78,7 +78,7 @@ public class TestAccumuloSplitRecovery {
 return true;
   }
   
-  @Test
+  @Test(timeout = 6)
   public void test() throws Exception {
 
 for (int tn = 0; tn  2; tn++) {

svn commit: r1470618 - /accumulo/branches/1.5/test/system/auto/TestUtils.py

2013-04-22 Thread ecn

Author: ecn
Date: Mon Apr 22 17:03:00 2013
New Revision: 1470618

URL: http://svn.apache.org/r1470618
Log:
ACCUMULO-1319 fix functional tests

Modified:
accumulo/branches/1.5/test/system/auto/TestUtils.py

Modified: accumulo/branches/1.5/test/system/auto/TestUtils.py
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/test/system/auto/TestUtils.py?rev=1470618r1=1470617r2=1470618view=diff
==
--- accumulo/branches/1.5/test/system/auto/TestUtils.py (original)
+++ accumulo/branches/1.5/test/system/auto/TestUtils.py Mon Apr 22 17:03:00 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):

svn commit: r1470639 - in /accumulo/trunk: ./ assemble/ core/ examples/ fate/src/main/java/org/apache/accumulo/fate/ZooStore.java fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java

2013-04-22 Thread ctubbsii

Author: ctubbsii
Date: Mon Apr 22 17:55:00 2013
New Revision: 1470639

URL: http://svn.apache.org/r1470639
Log:
ACCUMULO-1315 merge to trunk

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   (contents, props changed)
accumulo/trunk/server/   (props changed)
accumulo/trunk/src/   (props changed)

Propchange: accumulo/trunk/
--
  Merged 
/accumulo/branches/1.5:r1469651-1469795,1469797-1469850,1469852-1469859,1469861-1469906,1469908-1469966,1469968-1469969,1469971-1470606,1470608-1470617,1470619-1470631,1470633

Propchange: accumulo/trunk/assemble/
--
  Merged 
/accumulo/branches/1.5/assemble:r1467466-1468097,1468099-1468200,1468202-1468526,1468528-1468531,1468533-1468544,1468546-1468575,1468577-1468581,1468583-1468598,1468600-1468926,1468928-1468931,1468933,1468935-1468946,1468948-1468958,1468960-1468982,1468984-1468992,1468994,1468996-1469077,1469079,1469082-1469112,1469114-1469502,1469504-1469628,1469630-1469631,1469633-1469795,1469797-1469850,1469852-1469859,1469861-1469906,1469908-1469966,1469968-1469969,1469971-1470606,1470608-1470617,1470619-1470631,1470633

Propchange: accumulo/trunk/core/
--
  Merged 
/accumulo/branches/1.5/core:r1469651-1469795,1469797-1469850,1469852-1469859,1469861-1469906,1469908-1469966,1469968-1469969,1469971-1470606,1470608-1470617,1470619-1470631,1470633

Propchange: accumulo/trunk/examples/
--
  Merged 
/accumulo/branches/1.5/examples:r1467466-1468097,1468099-1468200,1468202-1468526,1468528-1468531,1468533-1468544,1468546-1468575,1468577-1468581,1468583-1468598,1468600-1468926,1468928-1468931,1468933,1468935-1468946,1468948-1468958,1468960-1468982,1468984-1468992,1468994,1468996-1469077,1469079,1469082-1469103,1469105-1469112,1469114-1469502,1469504-1469628,1469630-1469631,1469633-1469795,1469797-1469850,1469852-1469859,1469861-1469906,1469908-1469966,1469968-1469969,1469971-1470606,1470608-1470617,1470619-1470631,1470633

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:r1467466-1468097,1468099-1468200,1468202-1468526,1468528-1468531,1468533-1468544,1468546-1468575,1468577-1468581,1468583-1468598,1468600-1468926,1468928-1468931,1468933,1468935-1468946,1468948-1468958,1468960-1468982,1468984-1468992,1468994,1468996-1469077,1469079,1469082-1469103,1469105-1469112,1469114-1469502,1469504-1469628,1469630-1469631,1469633-1469795,1469797-1469850,1469852-1469859,1469861-1469906,1469908-1469966,1469968-1469969,1469971-1470606,1470608-1470617,1470619-1470631,1470633

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:r1467466-1468097,1468099-1468200,1468202-1468526,1468528-1468531,1468533-1468544,1468546-1468575,1468577-1468581,1468583-1468598,1468600-1468926,1468928-1468931,1468933,1468935-1468946,1468948-1468958,1468960-1468982,1468984-1468992,1468994,1468996-1469077,1469079,1469082-1469112,1469114-1469502,1469504-1469628,1469630-1469631,1469633-1469795,1469797-1469850,1469852-1469859,1469861-1469906,1469908-1469966,1469968-1469969,1469971-1470606,1470608-1470617,1470619-1470631,1470633

Modified: accumulo/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/pom.xml?rev=1470639r1=1470638r2=1470639view=diff
==
--- accumulo/trunk/pom.xml (original)
+++ accumulo/trunk/pom.xml Mon Apr 22 17:55:00 2013
@@ -329,6 +329,20 @@
   /configuration
 /plugin
 plugin
+  groupIdorg.apache.maven.plugins/groupId
+  artifactIdmaven-changes-plugin/artifactId
+  version2.9/version
+  configuration
+issueManagementSystems
+  issueManagementSystemJIRA/issueManagementSystem
+/issueManagementSystems
+onlyCurrentVersiontrue/onlyCurrentVersion
+statusIdsClosed,Resolved/statusIds
+maxEntries1/maxEntries
+useJqltrue/useJql
+  /configuration
+/plugin
+plugin

svn commit: r1470671 - /accumulo/branches/1.5/test/system/auto/stress/metadataMaxFiles.py

2013-04-22 Thread ecn

Author: ecn
Date: Mon Apr 22 19:29:59 2013
New Revision: 1470671

URL: http://svn.apache.org/r1470671
Log:
ACCUMULO-1211 new format breaks functional test

Modified:
accumulo/branches/1.5/test/system/auto/stress/metadataMaxFiles.py

Modified: accumulo/branches/1.5/test/system/auto/stress/metadataMaxFiles.py
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/test/system/auto/stress/metadataMaxFiles.py?rev=1470671r1=1470670r2=1470671view=diff
==
--- accumulo/branches/1.5/test/system/auto/stress/metadataMaxFiles.py (original)
+++ accumulo/branches/1.5/test/system/auto/stress/metadataMaxFiles.py Mon Apr 
22 19:29:59 2013
@@ -54,7 +54,7 @@ class MetadataMaxFiles(TestUtilsMixin, u
 h = self.runOn(self.masterHost(),
[self.accumulo_sh(), 
'org.apache.accumulo.test.GetMasterStats'])
 out, err = h.communicate()
-self.assert_(len([x for x in out.split('\n') if x.find('  Tablets 
1001') == 0]) == 5)
+self.assert_(len([x for x in out.split('\n') if x.find('  Tablets: 
1001') == 0]) == 5)
 
 def tearDown(self):
 TestUtilsMixin.tearDown(self)

svn commit: r1470685 - in /accumulo/trunk: ./ assemble/ core/ examples/ fate/src/main/java/org/apache/accumulo/fate/ fate/src/main/java/org/apache/accumulo/fate/zookeeper/ server/ src/ test/system/aut

2013-04-22 Thread ecn

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=1470685r1=1470684r2=1470685view=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))

svn commit: r1470705 - /accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/functional/LargeRowTest.java

2013-04-22 Thread ecn

Author: ecn
Date: Mon Apr 22 20:34:18 2013
New Revision: 1470705

URL: http://svn.apache.org/r1470705
Log:
ACCUMULO-1227 fix LargeRowTest

Modified:

accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/functional/LargeRowTest.java

Modified: 
accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/functional/LargeRowTest.java
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/functional/LargeRowTest.java?rev=1470705r1=1470704r2=1470705view=diff
==
--- 
accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/functional/LargeRowTest.java
 (original)
+++ 
accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/functional/LargeRowTest.java
 Mon Apr 22 20:34:18 2013
@@ -97,7 +97,7 @@ public class LargeRowTest extends Functi
 
 UtilWaitThread.sleep(12000);
 Logger.getLogger(LargeRowTest.class).warn(checking splits);
-checkSplits(REG_TABLE_NAME, 1, 9);
+checkSplits(REG_TABLE_NAME, 9, 16);
 
 verify(REG_TABLE_NAME);
   }

svn commit: r1470733 - /accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/MutationsRejectedException.java

2013-04-22 Thread kturner

Author: kturner
Date: Mon Apr 22 22:01:22 2013
New Revision: 1470733

URL: http://svn.apache.org/r1470733
Log:
ACCUMULO-765 make getAuthorizationFailures() public like it was in 1.4

Modified:

accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/MutationsRejectedException.java

Modified: 
accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/MutationsRejectedException.java
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/MutationsRejectedException.java?rev=1470733r1=1470732r2=1470733view=diff
==
--- 
accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/MutationsRejectedException.java
 (original)
+++ 
accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/MutationsRejectedException.java
 Mon Apr 22 22:01:22 2013
@@ -70,7 +70,7 @@ public class MutationsRejectedException 
* @return the internal list of authorization failures
* @deprecated since 1.5, see {@link #getAuthorizationFailuresMap()}
*/
-  ListKeyExtent getAuthorizationFailures() {
+  public ListKeyExtent getAuthorizationFailures() {
 return new ArrayListKeyExtent(af.keySet());
   }

svn commit: r1470734 - in /accumulo/branches/1.5: server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java test/src/test/resources/log4j.properties

2013-04-22 Thread kturner

Author: kturner
Date: Mon Apr 22 22:12:54 2013
New Revision: 1470734

URL: http://svn.apache.org/r1470734
Log:
ACCUMULO-1243 made accumulo more responsive to failed splits

Modified:

accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
accumulo/branches/1.5/test/src/test/resources/log4j.properties

Modified: 
accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java?rev=1470734r1=1470733r2=1470734view=diff
==
--- 
accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
 (original)
+++ 
accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
 Mon Apr 22 22:12:54 2013
@@ -124,6 +124,7 @@ import org.apache.accumulo.core.util.Cac
 import org.apache.accumulo.core.util.ColumnFQ;
 import org.apache.accumulo.core.util.Daemon;
 import org.apache.accumulo.core.util.LoggingRunnable;
+import org.apache.accumulo.core.util.Pair;
 import org.apache.accumulo.core.util.ServerServices;
 import org.apache.accumulo.core.util.ServerServices.Service;
 import org.apache.accumulo.core.util.SimpleThreadPool;
@@ -2446,24 +2447,39 @@ public class TabletServer extends Abstra
   Text locationToOpen = null;
   SortedMapKey,Value tabletsKeyValues = new TreeMapKey,Value();
   try {
-locationToOpen = verifyTabletInformation(extent, 
TabletServer.this.getTabletSession(), tabletsKeyValues, 
getClientAddressString(), getLock());
+PairText,KeyExtent pair = verifyTabletInformation(extent, 
TabletServer.this.getTabletSession(), tabletsKeyValues, 
getClientAddressString(), getLock());
+locationToOpen = pair.getFirst();
+if (pair.getSecond() != null) {
+  synchronized (openingTablets) {
+openingTablets.remove(extent);
+openingTablets.notifyAll();
+// it expected that the new extent will overlap the old one... if 
it does not, it should not be added to unopenedTablets
+if (!KeyExtent.findOverlapping(extent, new 
TreeSetKeyExtent(Arrays.asList(pair.getSecond(.contains(pair.getSecond()))
 {
+  throw new IllegalStateException(Fixed split does not overlap  
+ extent +   + pair.getSecond());
+}
+unopenedTablets.add(pair.getSecond());
+  }
+  // split was rolled back... try again
+  new AssignmentHandler(pair.getSecond()).run();
+  return;
+}
   } catch (Exception e) {
 synchronized (openingTablets) {
   openingTablets.remove(extent);
   openingTablets.notifyAll();
 }
 log.warn(Failed to verify tablet  + extent, e);
+enqueueMasterMessage(new 
TabletStatusMessage(TabletLoadState.LOAD_FAILURE, extent));
 throw new RuntimeException(e);
   }
 
   if (locationToOpen == null) {
 log.debug(Reporting tablet  + extent +  assignment failure: unable 
to verify Tablet Information);
-enqueueMasterMessage(new 
TabletStatusMessage(TabletLoadState.LOAD_FAILURE, extent));
 synchronized (openingTablets) {
   openingTablets.remove(extent);
   openingTablets.notifyAll();
 }
-
+enqueueMasterMessage(new 
TabletStatusMessage(TabletLoadState.LOAD_FAILURE, extent));
 return;
   }
 
@@ -2852,7 +2868,7 @@ public class TabletServer extends Abstra
   
   private long totalMinorCompactions;
   
-  private static Text verifyRootTablet(KeyExtent extent, TServerInstance 
instance) throws DistributedStoreException, AccumuloException {
+  private static PairText,KeyExtent verifyRootTablet(KeyExtent extent, 
TServerInstance instance) throws DistributedStoreException, AccumuloException {
 ZooTabletStateStore store = new ZooTabletStateStore();
 if (!store.iterator().hasNext()) {
   throw new AccumuloException(Illegal state: location is not set in 
zookeeper);
@@ -2866,10 +2882,11 @@ public class TabletServer extends Abstra
   throw new AccumuloException(Root tablet already has a location set);
 }
 
-return new Text(Constants.ZROOT_TABLET);
+return new PairText,KeyExtent(new Text(Constants.ZROOT_TABLET), null);
   }
   
-  public static Text verifyTabletInformation(KeyExtent extent, TServerInstance 
instance, SortedMapKey,Value tabletsKeyValues, String clientAddress,
+  public static PairText,KeyExtent verifyTabletInformation(KeyExtent extent, 
TServerInstance instance, SortedMapKey,Value tabletsKeyValues,
+  String clientAddress,
   ZooLock lock) throws AccumuloSecurityException, 
DistributedStoreException, AccumuloException {
 
 log.debug(verifying extent  + extent);
@@ -2916,7 +2933,7 @@ public class TabletServer extends Abstra

svn commit: r1470737 - in /accumulo/trunk: ./ assemble/ core/ core/src/main/java/org/apache/accumulo/core/client/ examples/ fate/src/main/java/org/apache/accumulo/fate/ fate/src/main/java/org/apache/a

2013-04-22 Thread kturner

Author: kturner
Date: Mon Apr 22 22:21:01 2013
New Revision: 1470737

URL: http://svn.apache.org/r1470737
Log:
ACCUMULO-1243 made accumulo more responsive to failed splits
ACCUMULO-765 make getAuthorizationFailures() public like it was in 1.4
ACCUMULO-578 don't log a message for every time a sorted WALOG disappears

Modified:
accumulo/trunk/   (props changed)
accumulo/trunk/assemble/   (props changed)
accumulo/trunk/core/   (props changed)

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/MutationsRejectedException.java
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/gc/GarbageCollectWriteAheadLogs.java

accumulo/trunk/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
accumulo/trunk/src/   (props changed)
accumulo/trunk/test/src/test/resources/log4j.properties

Propchange: accumulo/trunk/
--
  Merged 
/accumulo/branches/1.5:r1470634-1470670,1470672-1470683,1470685-1470704,1470706-1470736

Propchange: accumulo/trunk/assemble/
--
  Merged 
/accumulo/branches/1.5/assemble:r1470634-1470670,1470672-1470683,1470685-1470704,1470706-1470736

Propchange: accumulo/trunk/core/
--
  Merged 
/accumulo/branches/1.5/core:r1470634-1470670,1470672-1470683,1470685-1470704,1470706-1470736

Modified: 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/MutationsRejectedException.java
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/MutationsRejectedException.java?rev=1470737r1=1470736r2=1470737view=diff
==
--- 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/MutationsRejectedException.java
 (original)
+++ 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/MutationsRejectedException.java
 Mon Apr 22 22:21:01 2013
@@ -88,7 +88,7 @@ public class MutationsRejectedException 
* @return the internal list of authorization failures
* @deprecated since 1.5, see {@link #getAuthorizationFailuresMap()}
*/
-  ListKeyExtent getAuthorizationFailures() {
+  public ListKeyExtent getAuthorizationFailures() {
 return new ArrayListKeyExtent(af.keySet());
   }
   

Propchange: accumulo/trunk/examples/
--
  Merged 
/accumulo/branches/1.5/examples:r1470634-1470670,1470672-1470683,1470685-1470704,1470706-1470736

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:r1470634-1470670,1470672-1470683,1470685-1470704,1470706-1470736

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:r1470634-1470670,1470672-1470683,1470685-1470704,1470706-1470736

Propchange: accumulo/trunk/pom.xml
--
  Merged 
/accumulo/branches/1.5/pom.xml:r1470634-1470670,1470672-1470683,1470685-1470704,1470706-1470736

Propchange: accumulo/trunk/server/
--
  Merged 
/accumulo/branches/1.5/server:r1470634-1470670,1470672-1470683,1470685-1470704,1470706-1470736

Modified: 
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/gc/GarbageCollectWriteAheadLogs.java
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/gc/GarbageCollectWriteAheadLogs.java?rev=1470737r1=1470736r2=1470737view=diff
==
--- 
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/gc/GarbageCollectWriteAheadLogs.java
 (original)
+++ 
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/gc/GarbageCollectWriteAheadLogs.java
 Mon Apr 22 22:21:01 2013
@@ -189,15 +189,21 @@ public class GarbageCollectWriteAheadLog
 
 for (String sortedWALog : sortedWALogs) {
   log.debug(Removing sorted WAL  + sortedWALog);
+  Path swalog = new Path(recoveryDir, sortedWALog);
   try

svn commit: r1470607 - /accumulo/branches/1.5/test/src/test/java/org/apache/accumulo/test/TestAccumuloSplitRecovery.java

svn commit: r1470609 - in /accumulo/trunk: ./ assemble/ core/ examples/ fate/src/main/java/org/apache/accumulo/fate/ fate/src/main/java/org/apache/accumulo/fate/zookeeper/ server/ src/ test/src/test/j

svn commit: r1470618 - /accumulo/branches/1.5/test/system/auto/TestUtils.py

svn commit: r1470639 - in /accumulo/trunk: ./ assemble/ core/ examples/ fate/src/main/java/org/apache/accumulo/fate/ZooStore.java fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java

svn commit: r1470671 - /accumulo/branches/1.5/test/system/auto/stress/metadataMaxFiles.py

svn commit: r1470685 - in /accumulo/trunk: ./ assemble/ core/ examples/ fate/src/main/java/org/apache/accumulo/fate/ fate/src/main/java/org/apache/accumulo/fate/zookeeper/ server/ src/ test/system/aut

svn commit: r1470705 - /accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/functional/LargeRowTest.java

svn commit: r1470733 - /accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/MutationsRejectedException.java

svn commit: r1470734 - in /accumulo/branches/1.5: server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java test/src/test/resources/log4j.properties

svn commit: r1470737 - in /accumulo/trunk: ./ assemble/ core/ core/src/main/java/org/apache/accumulo/core/client/ examples/ fate/src/main/java/org/apache/accumulo/fate/ fate/src/main/java/org/apache/a

10 matches

Site Navigation

Mail list logo

Footer information