You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by mm...@apache.org on 2020/02/12 13:45:34 UTC
[accumulo] branch master updated (34c329c -> c9c9993)
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'
Posted by mm...@apache.org.
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 <mm...@apache.org>
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<Pair<Path,Path>> replacements = ServerConstants.getVolumeReplacements();
+ public static TabletFiles updateTabletVolumes(ServerContext context, ZooLock zooLock,
+ KeyExtent extent, TabletFiles tabletFiles, boolean replicate) {
+ List<Pair<Path,Path>> 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<LogEntry> logsToRemove = new ArrayList<>();
List<LogEntry> logsToAdd = new ArrayList<>();