From commits-return-23773-archive-asf-public=cust-asf.ponee.io@accumulo.apache.org Tue Mar 3 16:58:53 2020 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [207.244.88.153]) by mx-eu-01.ponee.io (Postfix) with SMTP id 04B5618063D for ; Tue, 3 Mar 2020 17:58:52 +0100 (CET) Received: (qmail 96011 invoked by uid 500); 3 Mar 2020 16:58:52 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 96002 invoked by uid 99); 3 Mar 2020 16:58:52 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 Mar 2020 16:58:52 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 2B3558DACA; Tue, 3 Mar 2020 16:58:52 +0000 (UTC) Date: Tue, 03 Mar 2020 16:58:52 +0000 To: "commits@accumulo.apache.org" Subject: [accumulo] branch 1.9 updated: Fixes #1525 - remove lines added in b67d3f9 in VolumeUtil (#1539) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <158325473204.19332.12968593029496338635@gitbox.apache.org> From: mmiller@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: accumulo X-Git-Refname: refs/heads/1.9 X-Git-Reftype: branch X-Git-Oldrev: 03deb513155129f9cdb17e73eaedfa787699075b X-Git-Newrev: 105c4f2ef77d396d6e6caf5695368b8f3f6b2779 X-Git-Rev: 105c4f2ef77d396d6e6caf5695368b8f3f6b2779 X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated 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<>();