[accumulo] branch 1.9 updated: Optimize Tablet volume replacement (#1505)

2020-02-12 Thread mmiller
This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a commit to branch 1.9
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/1.9 by this push:
 new 7513626  Optimize Tablet volume replacement (#1505)
7513626 is described below

commit 7513626cc504e5d93760c4218868dcb2dd6d49a5
Author: Mike Miller 
AuthorDate: Wed Feb 12 08:28:02 2020 -0500

Optimize Tablet volume replacement (#1505)

* Stop volume replacements from checking every file when not used
---
 server/base/src/main/java/org/apache/accumulo/server/fs/VolumeUtil.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git 
a/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeUtil.java 
b/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeUtil.java
index 4aea803..221bb4c 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeUtil.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeUtil.java
@@ -187,6 +187,8 @@ public class VolumeUtil {
   VolumeManager vm, KeyExtent extent, TabletFiles tabletFiles, boolean 
replicate)
   throws IOException {
 List> replacements = 
ServerConstants.getVolumeReplacements();
+if (replacements.isEmpty())
+  return tabletFiles;
 log.trace("Using volume replacements: " + replacements);
 
 List logsToRemove = new ArrayList<>();



[accumulo] 01/01: Merge branch '1.9'

2020-02-12 Thread mmiller
This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git

commit c9c99935416a0ac1c929ddd6dfad34344961a5df
Merge: 34c329c 7513626
Author: Mike Miller 
AuthorDate: Wed Feb 12 08:45:08 2020 -0500

Merge branch '1.9'

 server/base/src/main/java/org/apache/accumulo/server/fs/VolumeUtil.java | 2 ++
 1 file changed, 2 insertions(+)

diff --cc 
server/base/src/main/java/org/apache/accumulo/server/fs/VolumeUtil.java
index 2e720f9,221bb4c..9457067
--- a/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeUtil.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeUtil.java
@@@ -133,11 -183,13 +133,13 @@@ public class VolumeUtil 
 * configured in instance.volumes.replacements. Second, if a tablet dir is 
no longer configured
 * for use it chooses a new tablet directory.
 */
 -  public static TabletFiles updateTabletVolumes(AccumuloServerContext 
context, ZooLock zooLock,
 -  VolumeManager vm, KeyExtent extent, TabletFiles tabletFiles, boolean 
replicate)
 -  throws IOException {
 -List> replacements = 
ServerConstants.getVolumeReplacements();
 +  public static TabletFiles updateTabletVolumes(ServerContext context, 
ZooLock zooLock,
 +  KeyExtent extent, TabletFiles tabletFiles, boolean replicate) {
 +List> replacements =
 +ServerConstants.getVolumeReplacements(context.getConfiguration(), 
context.getHadoopConf());
+ if (replacements.isEmpty())
+   return tabletFiles;
 -log.trace("Using volume replacements: " + replacements);
 +log.trace("Using volume replacements: {}", replacements);
  
  List logsToRemove = new ArrayList<>();
  List logsToAdd = new ArrayList<>();



[accumulo] branch master updated (34c329c -> c9c9993)

2020-02-12 Thread mmiller
This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git.


from 34c329c  Remove unnecessary warning suppressions
 add 7513626  Optimize Tablet volume replacement (#1505)
 new c9c9993  Merge branch '1.9'

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 server/base/src/main/java/org/apache/accumulo/server/fs/VolumeUtil.java | 2 ++
 1 file changed, 2 insertions(+)



[accumulo] 01/01: Merge branch '1.9'

2020-02-12 Thread ctubbsii
This is an automated email from the ASF dual-hosted git repository.

ctubbsii pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git

commit 16608e9b312e969ae05d47bcba8380922c726ae2
Merge: c9c9993 b75f449
Author: Christopher Tubbs 
AuthorDate: Wed Feb 12 12:44:37 2020 -0500

Merge branch '1.9'




[accumulo] branch master updated (c9c9993 -> 16608e9)

2020-02-12 Thread ctubbsii
This is an automated email from the ASF dual-hosted git repository.

ctubbsii pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git.


from c9c9993  Merge branch '1.9'
 add b75f449  Make Accumulo 1.9 compatible with ZK 3.5 (#1506)
 new 16608e9  Merge branch '1.9'

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:



[accumulo] branch 1.9 updated: Make Accumulo 1.9 compatible with ZK 3.5 (#1506)

2020-02-12 Thread ctubbsii
This is an automated email from the ASF dual-hosted git repository.

ctubbsii pushed a commit to branch 1.9
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/1.9 by this push:
 new b75f449  Make Accumulo 1.9 compatible with ZK 3.5 (#1506)
b75f449 is described below

commit b75f449f0eea897e1e3eae8cdbb6cc519f2d0344
Author: Karthick Narendran 
AuthorDate: Wed Feb 12 12:43:39 2020 -0500

Make Accumulo 1.9 compatible with ZK 3.5 (#1506)
---
 assemble/bin/start-all.sh | 2 +-
 assemble/conf/templates/accumulo-site.xml | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/assemble/bin/start-all.sh b/assemble/bin/start-all.sh
index f03a6a8..984a85d 100755
--- a/assemble/bin/start-all.sh
+++ b/assemble/bin/start-all.sh
@@ -45,7 +45,7 @@ if [ ! -d $ZOOKEEPER_HOME ]; then
exit 1
 fi
 
-ZOOKEEPER_VERSION=$(find -L $ZOOKEEPER_HOME -maxdepth 1 -name 
"zookeeper-[0-9]*.jar" | head -1)
+ZOOKEEPER_VERSION=$(find -L $ZOOKEEPER_HOME -maxdepth 2 -name 
"zookeeper-[0-9]*.jar" | head -1)
 if [ -z "$ZOOKEEPER_VERSION" ]; then
echo "A Zookeeper JAR was not found in $ZOOKEEPER_HOME."
echo "Please check ZOOKEEPER_HOME, either globally or in accumulo-env.sh."
diff --git a/assemble/conf/templates/accumulo-site.xml 
b/assemble/conf/templates/accumulo-site.xml
index 5f80623..1871397 100644
--- a/assemble/conf/templates/accumulo-site.xml
+++ b/assemble/conf/templates/accumulo-site.xml
@@ -139,6 +139,7 @@ ${mvnProjBaseDir}
   $ACCUMULO_HOME/lib/[^.].*.jar,
   
   $ZOOKEEPER_HOME/zookeeper[^.].*.jar,
+  $ZOOKEEPER_HOME/lib/zookeeper[^.].*.jar,
   
   $HADOOP_CONF_DIR,
   



[accumulo] branch master updated: Fix #1508 - ITs broken by #1480 (#1509)

2020-02-12 Thread ctubbsii
This is an automated email from the ASF dual-hosted git repository.

ctubbsii pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/master by this push:
 new a3a6de3  Fix #1508 - ITs broken by #1480 (#1509)
a3a6de3 is described below

commit a3a6de39ad8169d47fee7a5f5e2031073f067184
Author: Keith Turner 
AuthorDate: Wed Feb 12 19:46:35 2020 -0500

Fix #1508 - ITs broken by #1480 (#1509)
---
 .../main/java/org/apache/accumulo/test/VerifySerialRecoveryIT.java| 4 ++--
 test/src/main/java/org/apache/accumulo/test/master/MergeStateIT.java  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git 
a/test/src/main/java/org/apache/accumulo/test/VerifySerialRecoveryIT.java 
b/test/src/main/java/org/apache/accumulo/test/VerifySerialRecoveryIT.java
index 024c76c..08dda8a 100644
--- a/test/src/main/java/org/apache/accumulo/test/VerifySerialRecoveryIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/VerifySerialRecoveryIT.java
@@ -118,12 +118,12 @@ public class VerifySerialRecoveryIT extends 
ConfigurableMacBase {
 // ignore metadata tables
 if (line.contains("!0") || line.contains("+r"))
   continue;
-if (line.contains("Starting Write-Ahead Log")) {
+if (line.contains("recovering data from walogs")) {
   assertFalse(started);
   started = true;
   recoveries++;
 }
-if (line.contains("Write-Ahead Log recovery complete")) {
+if (line.matches(".*recovered \\d+ mutations creating \\d+ entries 
from \\d+ walogs.*")) {
   assertTrue(started);
   started = false;
 }
diff --git 
a/test/src/main/java/org/apache/accumulo/test/master/MergeStateIT.java 
b/test/src/main/java/org/apache/accumulo/test/master/MergeStateIT.java
index 2eeb20e..e2b846f 100644
--- a/test/src/main/java/org/apache/accumulo/test/master/MergeStateIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/master/MergeStateIT.java
@@ -144,7 +144,7 @@ public class MergeStateIT extends ConfigurableMacBase {
 
   // Verify the tablet state: hosted, and count
   TabletStateStore metaDataStateStore =
-  TabletStateStore.getStoreForLevel(DataLevel.USER, context);
+  TabletStateStore.getStoreForLevel(DataLevel.USER, context, state);
   int count = 0;
   for (TabletLocationState tss : metaDataStateStore) {
 if (tss != null)