You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by el...@apache.org on 2014/06/06 17:33:10 UTC
[01/15] git commit: ACCUMULO-2774 Update pom to ensure enough memory
for tests Adds surefire-plugin param to increase heap size for some tests
with large memory requirements.
Repository: accumulo
Updated Branches:
refs/heads/ACCUMULO-378 028b78000 -> 5365b5501
ACCUMULO-2774 Update pom to ensure enough memory for tests Adds surefire-plugin param to increase heap size for some tests with large memory requirements.
Signed-off-by: Christopher Tubbs <ct...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ea266bb8
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ea266bb8
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ea266bb8
Branch: refs/heads/ACCUMULO-378
Commit: ea266bb8ee1327dee1cb9edd59c18fda715b5c4d
Parents: 8ebf617
Author: Jessica Seastrom <je...@cloudera.com>
Authored: Tue May 6 14:27:41 2014 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Thu Jun 5 14:16:57 2014 -0400
----------------------------------------------------------------------
pom.xml | 7 +++++++
1 file changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/ea266bb8/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index ec909d8..875b0f4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -587,6 +587,13 @@
</configuration>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <argLine>-Xmx768m</argLine>
+ </configuration>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.8</version>
[07/15] git commit: Merge remote-tracking branch 'origin/master' into
ACCUMULO-378
Posted by el...@apache.org.
Merge remote-tracking branch 'origin/master' into ACCUMULO-378
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/949eebbb
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/949eebbb
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/949eebbb
Branch: refs/heads/ACCUMULO-378
Commit: 949eebbba10cad5be40f539af72037a7d9109c94
Parents: aa4746d 204bcfe
Author: Josh Elser <el...@apache.org>
Authored: Thu Jun 5 16:09:32 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Thu Jun 5 16:09:32 2014 -0400
----------------------------------------------------------------------
pom.xml | 7 +++++++
.../main/java/org/apache/accumulo/tserver/TabletServer.java | 2 +-
.../main/java/org/apache/accumulo/tserver/tablet/Tablet.java | 2 +-
3 files changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/949eebbb/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/949eebbb/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
----------------------------------------------------------------------
[11/15] git commit: ACCUMULO-2864 add nullcheck in ZooSession.shutdown
Posted by el...@apache.org.
ACCUMULO-2864 add nullcheck in ZooSession.shutdown
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/affb9743
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/affb9743
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/affb9743
Branch: refs/heads/ACCUMULO-378
Commit: affb9743a3297ff6a147ab23bba44b5c5c045420
Parents: 9fcca2e
Author: Mike Drob <md...@cloudera.com>
Authored: Thu Jun 5 15:11:12 2014 -0700
Committer: Mike Drob <md...@cloudera.com>
Committed: Thu Jun 5 15:11:12 2014 -0700
----------------------------------------------------------------------
.../main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/affb9743/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
----------------------------------------------------------------------
diff --git a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
index de9729a..205ff01 100644
--- a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
+++ b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
@@ -152,6 +152,9 @@ public class ZooSession {
}
public static synchronized void shutdown() {
+ if (sessions == null)
+ return;
+
for (ZooSessionInfo zsi : sessions.values()) {
try {
zsi.zooKeeper.close();
[08/15] git commit: ACCUMULO-2774 Started seeing failures on
BlockedIOStreamTest after the patch was applied.
Posted by el...@apache.org.
ACCUMULO-2774 Started seeing failures on BlockedIOStreamTest after the patch was applied.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/56b99bf8
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/56b99bf8
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/56b99bf8
Branch: refs/heads/ACCUMULO-378
Commit: 56b99bf8ef5038e19b568399b130ded7444dafd7
Parents: 204bcfe
Author: Josh Elser <el...@apache.org>
Authored: Thu Jun 5 16:55:08 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Thu Jun 5 16:55:08 2014 -0400
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/56b99bf8/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 56cb185..67ea6d0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -602,7 +602,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <argLine>-Xmx768m</argLine>
+ <argLine>-Xmx1G</argLine>
</configuration>
</plugin>
<plugin>
[02/15] git commit: Merge branch '1.6.1-SNAPSHOT'
Posted by el...@apache.org.
Merge branch '1.6.1-SNAPSHOT'
Conflicts:
pom.xml
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/bcc387e3
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/bcc387e3
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/bcc387e3
Branch: refs/heads/ACCUMULO-378
Commit: bcc387e3d0e9746b2623f757f326f2fc02c53b92
Parents: 3af0642 ea266bb
Author: Christopher Tubbs <ct...@apache.org>
Authored: Thu Jun 5 14:20:37 2014 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Thu Jun 5 14:20:37 2014 -0400
----------------------------------------------------------------------
pom.xml | 7 +++++++
1 file changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/bcc387e3/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 5ecad3d,875b0f4..56cb185
--- a/pom.xml
+++ b/pom.xml
@@@ -599,11 -587,13 +599,18 @@@
</configuration>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <argLine>-Xmx768m</argLine>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.asciidoctor</groupId>
+ <artifactId>asciidoctor-maven-plugin</artifactId>
+ <version>0.1.4</version>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.8</version>
[15/15] git commit: ACCUMULO-378 Test stabilization
Posted by el...@apache.org.
ACCUMULO-378 Test stabilization
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5365b550
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5365b550
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5365b550
Branch: refs/heads/ACCUMULO-378
Commit: 5365b550120224920deebb08e15dca879de95885
Parents: 97044d7
Author: Josh Elser <el...@apache.org>
Authored: Fri Jun 6 11:32:38 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Fri Jun 6 11:32:38 2014 -0400
----------------------------------------------------------------------
.../org/apache/accumulo/test/replication/ReplicationTest.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/5365b550/test/src/test/java/org/apache/accumulo/test/replication/ReplicationTest.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/replication/ReplicationTest.java b/test/src/test/java/org/apache/accumulo/test/replication/ReplicationTest.java
index 7ea4c84..422130c 100644
--- a/test/src/test/java/org/apache/accumulo/test/replication/ReplicationTest.java
+++ b/test/src/test/java/org/apache/accumulo/test/replication/ReplicationTest.java
@@ -461,6 +461,10 @@ public class ReplicationTest extends ConfigurableMacIT {
keepRunning.set(false);
t.join(5000);
+ // The master is only running every second to create records in the replication table from the metadata table
+ // Sleep a sufficient amount of time to ensure that we get the straggling WALs that might have been created at the end
+ Thread.sleep(5000);
+
Scanner s = ReplicationTable.getScanner(conn);
StatusSection.limit(s);
Set<String> replFiles = new HashSet<>();
[13/15] git commit: Merge branch '1.6.1-SNAPSHOT'
Posted by el...@apache.org.
Merge branch '1.6.1-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/809b73c0
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/809b73c0
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/809b73c0
Branch: refs/heads/ACCUMULO-378
Commit: 809b73c052b5c50090c502a03ccd9a7da4c767dd
Parents: e106fe0 18d6ca1
Author: Mike Drob <md...@cloudera.com>
Authored: Thu Jun 5 15:12:21 2014 -0700
Committer: Mike Drob <md...@cloudera.com>
Committed: Thu Jun 5 15:12:21 2014 -0700
----------------------------------------------------------------------
.../main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
[06/15] git commit: ACCUMULO-378 Remove API method which accepts an
instance of ReplicaSystem.
Posted by el...@apache.org.
ACCUMULO-378 Remove API method which accepts an instance of ReplicaSystem.
There's no reason that a client would commonly have this object instantiated,
so it's a bit silly to provide a method that would cater to that case.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/aa4746de
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/aa4746de
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/aa4746de
Branch: refs/heads/ACCUMULO-378
Commit: aa4746de05b2e2a4ba4ae3dc322fd39ecbac1fda
Parents: 24925e1
Author: Josh Elser <el...@apache.org>
Authored: Thu Jun 5 16:08:21 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Thu Jun 5 16:08:21 2014 -0400
----------------------------------------------------------------------
.../accumulo/core/client/admin/ReplicationOperations.java | 9 +--------
.../core/client/impl/ReplicationOperationsImpl.java | 8 --------
2 files changed, 1 insertion(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/aa4746de/core/src/main/java/org/apache/accumulo/core/client/admin/ReplicationOperations.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/admin/ReplicationOperations.java b/core/src/main/java/org/apache/accumulo/core/client/admin/ReplicationOperations.java
index 9267f67..27ef538 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/admin/ReplicationOperations.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/admin/ReplicationOperations.java
@@ -32,20 +32,13 @@ import org.apache.accumulo.core.client.replication.ReplicaSystem;
public interface ReplicationOperations {
/**
- * Defines a cluster with the given name using the given {@link ReplicaSystem}.
+ * Defines a cluster with the given name using the given {@link ReplicaSystem} implementation.
* @param name Name of the cluster, used for configuring replication on tables
* @param system Type of system to be replicated to
*/
public void addPeer(String name, Class<? extends ReplicaSystem> system) throws AccumuloException, AccumuloSecurityException, PeerExistsException;
/**
- * Defines a cluster with the given name using the given {@link ReplicaSystem}.
- * @param name Name of the cluster, used for configuring replication on tables
- * @param system Type of system to be replicated to
- */
- public void addPeer(String name, ReplicaSystem system) throws AccumuloException, AccumuloSecurityException, PeerExistsException;
-
- /**
* Defines a cluster with the given name and the given name system.
* @param name Unique name for the cluster
* @param replicaType {@link ReplicaSystem} class name to use to replicate the data
http://git-wip-us.apache.org/repos/asf/accumulo/blob/aa4746de/core/src/main/java/org/apache/accumulo/core/client/impl/ReplicationOperationsImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/ReplicationOperationsImpl.java b/core/src/main/java/org/apache/accumulo/core/client/impl/ReplicationOperationsImpl.java
index 8c50ecc..b16f38f 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/ReplicationOperationsImpl.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/ReplicationOperationsImpl.java
@@ -85,14 +85,6 @@ public class ReplicationOperationsImpl implements ReplicationOperations {
}
@Override
- public void addPeer(String name, ReplicaSystem system) throws AccumuloException, AccumuloSecurityException, PeerExistsException {
- checkNotNull(name);
- checkNotNull(system);
-
- addPeer(name, system.getClass().getName());
- }
-
- @Override
public void addPeer(final String name, final String replicaType) throws AccumuloException, AccumuloSecurityException, PeerExistsException {
checkNotNull(name);
checkNotNull(replicaType);
[09/15] git commit: ACCUMULO-2774 Started seeing failures on
BlockedIOStreamTest after the patch was applied.
Posted by el...@apache.org.
ACCUMULO-2774 Started seeing failures on BlockedIOStreamTest after the patch was applied.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c2025989
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c2025989
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c2025989
Branch: refs/heads/ACCUMULO-378
Commit: c2025989f4344ade48be58230d9179236a70872e
Parents: ea266bb
Author: Josh Elser <el...@apache.org>
Authored: Thu Jun 5 16:55:08 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Thu Jun 5 17:37:26 2014 -0400
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/c2025989/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 875b0f4..515234d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -590,7 +590,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <argLine>-Xmx768m</argLine>
+ <argLine>-Xmx1G</argLine>
</configuration>
</plugin>
<plugin>
[10/15] git commit: Merge branch '1.6.1-SNAPSHOT'
Posted by el...@apache.org.
Merge branch '1.6.1-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e106fe07
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e106fe07
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e106fe07
Branch: refs/heads/ACCUMULO-378
Commit: e106fe07b02ec87ea2b6a3195fcd929a136311c5
Parents: 56b99bf c202598
Author: Josh Elser <el...@apache.org>
Authored: Thu Jun 5 17:37:36 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Thu Jun 5 17:37:36 2014 -0400
----------------------------------------------------------------------
----------------------------------------------------------------------
[04/15] git commit: ACCUMULO-2041 should not clear compaction state
while still compacting
Posted by el...@apache.org.
ACCUMULO-2041 should not clear compaction state while still compacting
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/80712528
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/80712528
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/80712528
Branch: refs/heads/ACCUMULO-378
Commit: 8071252801817dc88d5e6b50fa58ad3b0a629446
Parents: bcc387e
Author: Eric C. Newton <er...@gmail.com>
Authored: Thu Jun 5 16:02:00 2014 -0400
Committer: Eric C. Newton <er...@gmail.com>
Committed: Thu Jun 5 16:04:44 2014 -0400
----------------------------------------------------------------------
.../src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/80712528/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
index c0a0ab3..4443a72 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
@@ -1729,7 +1729,7 @@ public class Tablet implements TabletCommitter {
t2 = System.currentTimeMillis();
- majorCompactionState = null;
+ majorCompactionState = CompactionState.IN_PROGRESS;
notifyAll();
VolumeManager fs = getTabletServer().getFileSystem();
[05/15] git commit: ACCUMULO-378 When we fail to get the
ReplicaSystem, wait a bit before returning
Posted by el...@apache.org.
ACCUMULO-378 When we fail to get the ReplicaSystem, wait a bit before returning
It's the sign of a bad configuration (or bad implementation). If we return
immediately, it will get near immediately re-queued and spam the system.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/24925e11
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/24925e11
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/24925e11
Branch: refs/heads/ACCUMULO-378
Commit: 24925e116339a68917f69dde9a88ef07ca7d1eea
Parents: 028b780
Author: Josh Elser <el...@apache.org>
Authored: Thu Jun 5 16:00:17 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Thu Jun 5 16:08:11 2014 -0400
----------------------------------------------------------------------
.../tserver/replication/ReplicationProcessor.java | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/24925e11/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/ReplicationProcessor.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/ReplicationProcessor.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/ReplicationProcessor.java
index f1bba6b..3b3df87 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/ReplicationProcessor.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/ReplicationProcessor.java
@@ -81,7 +81,19 @@ public class ReplicationProcessor implements Processor {
log.debug("Received replication work for {} to {}", file, target);
- ReplicaSystem replica = getReplicaSystem(target);
+ ReplicaSystem replica;
+ try {
+ replica = getReplicaSystem(target);
+ } catch (Exception e) {
+ log.error("Could not instantiate ReplicaSystem for {}, waiting before returning the work", target, e);
+ try {
+ Thread.sleep(10000);
+ } catch (InterruptedException ie) {
+ Thread.currentThread().interrupt();
+ }
+
+ return;
+ }
Status status;
try {
[03/15] git commit: ACCUMULO-2255 fix NPE during commit
Posted by el...@apache.org.
ACCUMULO-2255 fix NPE during commit
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/204bcfed
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/204bcfed
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/204bcfed
Branch: refs/heads/ACCUMULO-378
Commit: 204bcfedcd9840b8b95bf48b81d5d1e4eaed5016
Parents: 8071252
Author: Eric C. Newton <er...@gmail.com>
Authored: Thu Jun 5 16:04:18 2014 -0400
Committer: Eric C. Newton <er...@gmail.com>
Committed: Thu Jun 5 16:04:44 2014 -0400
----------------------------------------------------------------------
.../src/main/java/org/apache/accumulo/tserver/TabletServer.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/204bcfed/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
index ee28c7f..ce84bd3 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
@@ -1478,7 +1478,7 @@ public class TabletServer extends AbstractMetricsImpl implements org.apache.accu
KeyExtent extent = commitSession.getExtent();
- if (extent == us.currentTablet.getExtent()) {
+ if (us.currentTablet != null && extent == us.currentTablet.getExtent()) {
// because constraint violations may filter out some
// mutations, for proper accounting with the client code,
// need to increment the count based on the original
[12/15] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT
Posted by el...@apache.org.
Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/18d6ca1b
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/18d6ca1b
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/18d6ca1b
Branch: refs/heads/ACCUMULO-378
Commit: 18d6ca1bf79793443366c04e54285214a69eb422
Parents: c202598 affb974
Author: Mike Drob <md...@cloudera.com>
Authored: Thu Jun 5 15:12:08 2014 -0700
Committer: Mike Drob <md...@cloudera.com>
Committed: Thu Jun 5 15:12:08 2014 -0700
----------------------------------------------------------------------
.../main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/18d6ca1b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
----------------------------------------------------------------------
[14/15] git commit: Merge remote-tracking branch 'origin/master' into
ACCUMULO-378
Posted by el...@apache.org.
Merge remote-tracking branch 'origin/master' into ACCUMULO-378
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/97044d74
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/97044d74
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/97044d74
Branch: refs/heads/ACCUMULO-378
Commit: 97044d749890e8d08d015ef121c1a4b04f396735
Parents: 949eebb 809b73c
Author: Josh Elser <el...@apache.org>
Authored: Fri Jun 6 11:32:29 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Fri Jun 6 11:32:29 2014 -0400
----------------------------------------------------------------------
.../main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java | 3 +++
pom.xml | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------