[accumulo] branch 1.9 updated: Fixes #1525 - remove lines added in b67d3f9 in VolumeUtil (#1539)

2020-03-03 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 105c4f2  Fixes #1525 - remove lines added in b67d3f9 in VolumeUtil 
(#1539)
105c4f2 is described below

commit 105c4f2ef77d396d6e6caf5695368b8f3f6b2779
Author: Jeffrey Zeiberg 
AuthorDate: Tue Mar 3 11:58:41 2020 -0500

Fixes #1525 - remove lines added in b67d3f9 in VolumeUtil (#1539)

* Revert optimization that broke special tablet directory volume code
that is still needed in 1.X
---
 .../base/src/main/java/org/apache/accumulo/server/fs/VolumeUtil.java   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

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 221bb4c..4469f6d 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,8 +187,7 @@ 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-03-03 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 20853e55fc3d556c444376ad803fe8b0a6ce4e49
Merge: e4b69f9 105c4f2
Author: Mike Miller 
AuthorDate: Tue Mar 3 12:03:41 2020 -0500

Merge branch '1.9'

* git merge 1.9 -sours




[accumulo] branch master updated (e4b69f9 -> 20853e5)

2020-03-03 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 e4b69f9  Replace explicit types with diamond operator (#1540)
 add 105c4f2  Fixes #1525 - remove lines added in b67d3f9 in VolumeUtil 
(#1539)
 new 20853e5  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 master updated (f09c4e2 -> effcb1e)

2020-03-03 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 f09c4e2  Increase memory in GarbageCollectorIT. Fixes #1534
 add effcb1e  Increase UnusedWALIT timeout to 4 minutes

No new revisions were added by this update.

Summary of changes:
 test/src/main/java/org/apache/accumulo/test/UnusedWALIT.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)



[accumulo] branch master updated (20853e5 -> f09c4e2)

2020-03-03 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 20853e5  Merge branch '1.9'
 add f09c4e2  Increase memory in GarbageCollectorIT. Fixes #1534

No new revisions were added by this update.

Summary of changes:
 .../java/org/apache/accumulo/test/functional/GarbageCollectorIT.java| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)