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

[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 <jzeib...@gmail.com>
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<Pair<Path,Path>> replacements = 
ServerConstants.getVolumeReplacements();
-    if (replacements.isEmpty())
-      return tabletFiles;
+
     log.trace("Using volume replacements: " + replacements);
 
     List<LogEntry> logsToRemove = new ArrayList<>();