[accumulo] branch master updated: Revert "Update Last Location. Solution for #1169 (#1453)"
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 1917013 Revert "Update Last Location. Solution for #1169 (#1453)"
1917013 is described below
commit 191701386e56e701f0562ea01de594a593093e9a
Author: Christopher Tubbs
AuthorDate: Mon Apr 6 22:48:53 2020 -0400
Revert "Update Last Location. Solution for #1169 (#1453)"
This reverts commit d12ff6c700e003202fd2e9842499324561246b15.
The reverted commit was not ready for merging, as it caused dozens of
test failures (around 60), and appeared to fundamentally break parsing
of many stored locations by causing locations to be parsed with
HostAndPort.fromString(location) that were not created with
HostAndPort.toString(). This may be a more fundamental problem with some
of the code in Ample; further investigation and testing is needed before
merging.
---
.../accumulo/core/metadata/schema/Ample.java | 4 -
.../master/state/DistributedStoreException.java| 33 +
.../master/state/LoggingTabletStateStore.java | 21 ++--
.../server/master/state/MetaDataStateStore.java| 134 ++---
.../server/master/state/SuspendingTServer.java | 11 ++
.../server/master/state/TServerInstance.java | 34 ++
.../server/master/state/TabletStateStore.java | 23 ++--
.../server/master/state/ZooTabletStateStore.java | 26 ++--
.../server/metadata/TabletMutatorBase.java | 17 ---
.../accumulo/server/util/MasterMetadataUtil.java | 37 +-
.../master/state/RootTabletStateStoreTest.java | 13 +-
.../apache/accumulo/master/TabletGroupWatcher.java | 7 +-
.../org/apache/accumulo/tserver/TabletServer.java | 5 +-
.../accumulo/tserver/tablet/DatafileManager.java | 8 +-
.../org/apache/accumulo/tserver/tablet/Tablet.java | 3 +-
.../test/MasterRepairsDualAssignmentIT.java| 24 ++--
.../accumulo/test/functional/SplitRecoveryIT.java | 12 +-
.../apache/accumulo/test/master/MergeStateIT.java | 6 +-
.../accumulo/test/performance/NullTserver.java | 9 +-
19 files changed, 293 insertions(+), 134 deletions(-)
diff --git
a/core/src/main/java/org/apache/accumulo/core/metadata/schema/Ample.java
b/core/src/main/java/org/apache/accumulo/core/metadata/schema/Ample.java
index bd3eb09..a7039d4 100644
--- a/core/src/main/java/org/apache/accumulo/core/metadata/schema/Ample.java
+++ b/core/src/main/java/org/apache/accumulo/core/metadata/schema/Ample.java
@@ -222,10 +222,6 @@ public interface Ample {
public TabletMutator putChopped();
-public TabletMutator putSuspension(TServer tserver, long suspensionTime);
-
-public TabletMutator deleteSuspension();
-
/**
* This method persist (or queues for persisting) previous put and deletes
against this object.
* Unless this method is called, previous calls will never be persisted.
The purpose of this
diff --git
a/server/base/src/main/java/org/apache/accumulo/server/master/state/DistributedStoreException.java
b/server/base/src/main/java/org/apache/accumulo/server/master/state/DistributedStoreException.java
new file mode 100644
index 000..a099bbf
--- /dev/null
+++
b/server/base/src/main/java/org/apache/accumulo/server/master/state/DistributedStoreException.java
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.accumulo.server.master.state;
+
+public class DistributedStoreException extends Exception {
+
+ private static final long serialVersionUID = 1L;
+
+ public DistributedStoreException(String why) {
+super(why);
+ }
+
+ public DistributedStoreException(Exception cause) {
+super(cause);
+ }
+
+}
diff --git
a/server/base/src/main/java/org/apache/accumulo/server/master/state/LoggingTabletStateStore.java
b/server/base/src/main/java/org/apache/accumulo/server/master/state/LoggingTabletStateStore.java
index 4249fc2..8b5fe1a 100644
---
a/server/base/src/main/java/org/apache/accumulo/server/master/state/LoggingTabletStateStore.java
+++
[accumulo] branch master updated: Fix new warnings and broken IT
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 6abe601 Fix new warnings and broken IT
6abe601 is described below
commit 6abe601a8b6c20ed004b9f30373d9614d6a0f245
Author: Christopher Tubbs
AuthorDate: Mon Apr 6 16:00:10 2020 -0400
Fix new warnings and broken IT
* Fix unused variables leftover from #1453
* Fix warnings and NamespacesIT from #1053/#1060
* Fix ambiguous use of array as varargs param
* Pass around importDirs as List instead of array
* Export table before attempting import (NamespacesIT)
in order to create the metadata
---
.../core/clientImpl/TableOperationsImpl.java | 20 +---
.../server/master/state/MetaDataStateStore.java | 7 ---
.../accumulo/server/util/MasterMetadataUtil.java | 15 ---
.../master/tableOps/tableImport/ImportTable.java | 5 +++--
.../accumulo/tserver/tablet/DatafileManager.java | 4 +---
.../java/org/apache/accumulo/test/NamespacesIT.java | 2 ++
6 files changed, 15 insertions(+), 38 deletions(-)
diff --git
a/core/src/main/java/org/apache/accumulo/core/clientImpl/TableOperationsImpl.java
b/core/src/main/java/org/apache/accumulo/core/clientImpl/TableOperationsImpl.java
index 6428359..8382c5e 100644
---
a/core/src/main/java/org/apache/accumulo/core/clientImpl/TableOperationsImpl.java
+++
b/core/src/main/java/org/apache/accumulo/core/clientImpl/TableOperationsImpl.java
@@ -447,8 +447,7 @@ public class TableOperationsImpl extends
TableOperationsHelper {
if (splits.size() <= 2) {
addSplits(env.tableName, new TreeSet<>(splits), env.tableId);
- for (int i = 0; i < splits.size(); i++)
-env.latch.countDown();
+ splits.forEach(s -> env.latch.countDown());
return;
}
@@ -1492,7 +1491,7 @@ public class TableOperationsImpl extends
TableOperationsHelper {
* if zero or more than one copy of the exportMetadata.zip file
are found in the
* directories provided.
*/
- public static Path findExportFile(ClientContext context, String[] importDirs)
+ public static Path findExportFile(ClientContext context, List
importDirs)
throws AccumuloException {
LinkedHashSet exportFiles = new LinkedHashSet<>();
for (String importDir : importDirs) {
@@ -1550,15 +1549,14 @@ public class TableOperationsImpl extends
TableOperationsHelper {
checkArgument(tableName.length() <= MAX_TABLE_NAME_LEN,
"Table name is longer than " + MAX_TABLE_NAME_LEN + " characters");
-String[] importDirs = importDir.split(",");
-try {
- for (int i = 0; i < importDirs.length; i++) {
-importDirs[i] = checkPath(importDirs[i], "Table", "").toString();
+List importDirs = new ArrayList<>();
+for (String dir : importDir.split(",")) {
+ try {
+importDirs.add(checkPath(dir, "Table", "").toString());
+ } catch (IOException e) {
+throw new AccumuloException(e);
}
-} catch (IOException e) {
- throw new AccumuloException(e);
}
-String normedImportDir = StringUtils.join(importDirs, ",");
try {
Path exportFilePath = findExportFile(context, importDirs);
@@ -1580,7 +1578,7 @@ public class TableOperationsImpl extends
TableOperationsHelper {
}
List args =
Arrays.asList(ByteBuffer.wrap(tableName.getBytes(UTF_8)),
-ByteBuffer.wrap(normedImportDir.getBytes(UTF_8)));
+ByteBuffer.wrap(StringUtils.join(importDirs, ",").getBytes(UTF_8)));
Map opts = Collections.emptyMap();
diff --git
a/server/base/src/main/java/org/apache/accumulo/server/master/state/MetaDataStateStore.java
b/server/base/src/main/java/org/apache/accumulo/server/master/state/MetaDataStateStore.java
index ce2fc7f..a92b69d 100644
---
a/server/base/src/main/java/org/apache/accumulo/server/master/state/MetaDataStateStore.java
+++
b/server/base/src/main/java/org/apache/accumulo/server/master/state/MetaDataStateStore.java
@@ -30,20 +30,13 @@ import
org.apache.accumulo.core.metadata.schema.MetadataSchema;
import org.apache.accumulo.core.metadata.schema.TabletMetadata.LocationType;
import org.apache.accumulo.core.tabletserver.log.LogEntry;
import org.apache.hadoop.fs.Path;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
class MetaDataStateStore implements TabletStateStore {
- private static final int THREADS = 4;
- private static final int LATENCY = 1000;
- private static final int MAX_MEMORY = 200 * 1024 * 1024;
-
protected final ClientContext context;
protected final CurrentState state;
private final String targetTableName;
private final Ample ample;
- private static final Logger log =
LoggerFactory.getLogger(MetaDataStateStore.class);
protected
Buildbot success in on jekyll_websites
The Buildbot has detected a passing build on builder jekyll_websites while building accumulo. Full details are available at: https://ci2.apache.org/#builders/7/builds/72 Buildbot URL: https://ci2.apache.org/ Worker for this Build: bb_slave10_ubuntu Build Reason: Triggered jekyll auto-build via .asf.yaml by mmiller Blamelist: asfinfra, commits@accumulo.apache.org Build succeeded! Sincerely, -The Buildbot
[accumulo-website] branch asf-staging updated: Automatic Site Publish by Buildbot
This is an automated email from the ASF dual-hosted git repository.
git-site-role pushed a commit to branch asf-staging
in repository https://gitbox.apache.org/repos/asf/accumulo-website.git
The following commit(s) were added to refs/heads/asf-staging by this push:
new 79f13fd Automatic Site Publish by Buildbot
79f13fd is described below
commit 79f13fdc39ff43c0061a4bf149441c44b5d7daff
Author: buildbot
AuthorDate: Mon Apr 6 16:06:38 2020 +
Automatic Site Publish by Buildbot
---
.../docs/2.x/administration/in-depth-install.html | 29 --
output/feed.xml| 4 +--
output/search_data.json| 2 +-
3 files changed, 30 insertions(+), 5 deletions(-)
diff --git a/output/docs/2.x/administration/in-depth-install.html
b/output/docs/2.x/administration/in-depth-install.html
index 9ff9703..e85388c 100644
--- a/output/docs/2.x/administration/in-depth-install.html
+++ b/output/docs/2.x/administration/in-depth-install.html
@@ -939,13 +939,38 @@ started. Also, set the these properties in replication.receipt.service.port
= 0
-Multiple TabletServers cannot be started using the accumulo-cluster or accumulo-service commands
-at this time. The accumulo command must
be used:
+In order to start multiple TabletServers on a node, the accumulo command must be used:
ACCUMULO_SERVICE_INSTANCE=1 ./bin/accumulo tserver
./logs/tserver1.out
ACCUMULO_SERVICE_INSTANCE=2 ./bin/accumulo tserver
./logs/tserver2.out
+Running
multiple TabletServers per node in Accumulo 2.1.0 and later
+Starting with Accumulo 2.1.0, the accumulo-cluster script can be used along with
environment
+variable NUM_TSERVERS as a convenient
alternative to the accumulo command to
start / stop
+multiple TabletServers per node. For example, the following commands can be
used to start / stop
+2 TabletServers on the current node:
+
+NUM_TSERVERS=2 ./bin/accumulo-cluster start-here
+NUM_TSERVERS=2 ./bin/accumulo-cluster stop-here
+
+
+To start / stop the entire Accumulo cluster with 2 TabletServers per worker
node, use:
+
+NUM_TSERVERS=2 ./bin/accumulo-cluster start
+NUM_TSERVERS=2 ./bin/accumulo-cluster stop
+
+
+Other commands like accumulo-cluster
start-tservers and accumulo-cluster
stop-tservers support
+the use of NUM_TSERVERS to specify the
number of TabletServers per worker node.
+
+When accumulo-cluster is used along
with NUM_TSERVERS greater than 1, the
resultant log files
+and redirected stdout / stderr files for each TabletServer running on the node
have the instance
+number as part of their respective filenames.
+
+Lastly, starting with Accumulo 2.1.0 the accumulo-env.sh script ensures that Accumulo
metrics
+are correctly associated with the respective instance number for each
TabletServer on a node.
+
Logging
Accumulo processes each write to a set of log files. By default, these logs
are found at directory
diff --git a/output/feed.xml b/output/feed.xml
index 1115c9e..8e9d9c6 100644
--- a/output/feed.xml
+++ b/output/feed.xml
@@ -6,8 +6,8 @@
https://accumulo.apache.org/
https://accumulo.apache.org/feed.xml; rel="self"
type="application/rss+xml"/>
-Fri, 03 Apr 2020 18:10:53 +
-Fri, 03 Apr 2020 18:10:53 +
+Mon, 06 Apr 2020 16:06:32 +
+Mon, 06 Apr 2020 16:06:32 +
Jekyll v4.0.0
diff --git a/output/search_data.json b/output/search_data.json
index 96b0b38..9f474b8 100644
--- a/output/search_data.json
+++ b/output/search_data.json
@@ -23,7 +23,7 @@
"docs-2-x-administration-in-depth-install": {
"title": "In-depth Installation",
- "content" : "This document provides detailed instructions for
installing Accumulo. For basicinstructions, see the quick start.HardwareBecause
we are running essentially two or three systems simultaneously layeredacross
the cluster: HDFS, Accumulo and MapReduce, it is typical for hardware toconsist
of 4 to 8 cores, and 8 to 32 GB RAM. This is so each running process can haveat
least one core and 2 - 4 GB each.One core running HDFS can typically keep 2 to
4 disks busy, so each machi [...]
+ "content" : "This document provides detailed instructions for
installing Accumulo. For basicinstructions, see the quick start.HardwareBecause
we are running essentially two or three systems simultaneously layeredacross
the cluster: HDFS, Accumulo and MapReduce, it is typical for hardware toconsist
of 4 to 8 cores, and 8 to 32 GB RAM. This is so each running process can haveat
least one core and 2 - 4 GB each.One core running HDFS can typically keep 2 to
4 disks busy, so each machi [...]
"url": " /docs/2.x/administration/in-depth-install",
"categories": "administration"
},
[accumulo-website] branch master updated: Add instructions for multiple TServers in 2.1.0 (#225)
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-website.git
The following commit(s) were added to refs/heads/master by this push:
new 8e9a703 Add instructions for multiple TServers in 2.1.0 (#225)
8e9a703 is described below
commit 8e9a70310d79dbddc30a877b98aa7fdb912873e8
Author: Arvind Shyamsundar
AuthorDate: Mon Apr 6 09:06:07 2020 -0700
Add instructions for multiple TServers in 2.1.0 (#225)
* Explains the usage of accumulo-cluster and NUM_TSERVERS
* Adds details of filenames when running more than 1 TServer / node
---
_docs-2/administration/in-depth-install.md | 31 --
1 file changed, 29 insertions(+), 2 deletions(-)
diff --git a/_docs-2/administration/in-depth-install.md
b/_docs-2/administration/in-depth-install.md
index 623ae51..09a53d6 100644
--- a/_docs-2/administration/in-depth-install.md
+++ b/_docs-2/administration/in-depth-install.md
@@ -459,14 +459,41 @@ started. Also, set the these properties in
[accumulo.properties]:
* {% plink tserver.port.search %} = `true`
* {% plink replication.receipt.service.port %} = `0`
-Multiple TabletServers cannot be started using the `accumulo-cluster` or
`accumulo-service` commands
-at this time. The `accumulo` command must be used:
+In order to start multiple TabletServers on a node, the `accumulo` command
must be used:
```
ACCUMULO_SERVICE_INSTANCE=1 ./bin/accumulo tserver &> ./logs/tserver1.out &
ACCUMULO_SERVICE_INSTANCE=2 ./bin/accumulo tserver &> ./logs/tserver2.out &
```
+ Running multiple TabletServers per node in Accumulo 2.1.0 and later
+Starting with Accumulo 2.1.0, the `accumulo-cluster` script can be used along
with environment
+variable `NUM_TSERVERS` as a convenient alternative to the `accumulo` command
to start / stop
+multiple TabletServers per node. For example, the following commands can be
used to start / stop
+2 TabletServers on the current node:
+
+```
+NUM_TSERVERS=2 ./bin/accumulo-cluster start-here
+NUM_TSERVERS=2 ./bin/accumulo-cluster stop-here
+```
+
+To start / stop the entire Accumulo cluster with 2 TabletServers per worker
node, use:
+
+```
+NUM_TSERVERS=2 ./bin/accumulo-cluster start
+NUM_TSERVERS=2 ./bin/accumulo-cluster stop
+```
+
+Other commands like `accumulo-cluster start-tservers` and `accumulo-cluster
stop-tservers` support
+the use of `NUM_TSERVERS` to specify the number of TabletServers per worker
node.
+
+When `accumulo-cluster` is used along with `NUM_TSERVERS` greater than 1, the
resultant log files
+and redirected stdout / stderr files for each TabletServer running on the node
have the instance
+number as part of their respective filenames.
+
+Lastly, starting with Accumulo 2.1.0 the `accumulo-env.sh` script ensures that
Accumulo metrics
+are correctly associated with the respective instance number for each
TabletServer on a node.
+
## Logging
Accumulo processes each write to a set of log files. By default, these logs
are found at directory
[accumulo] branch master updated: Formatting
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
The following commit(s) were added to refs/heads/master by this push:
new 240d137 Formatting
240d137 is described below
commit 240d13701833ed3a937685a45d2e464d628ecdf0
Author: Mike Miller
AuthorDate: Mon Apr 6 10:47:48 2020 -0400
Formatting
---
.../java/org/apache/accumulo/server/util/MasterMetadataUtil.java| 4 ++--
.../java/org/apache/accumulo/tserver/tablet/DatafileManager.java| 2 +-
.../src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java| 6 +++---
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git
a/server/base/src/main/java/org/apache/accumulo/server/util/MasterMetadataUtil.java
b/server/base/src/main/java/org/apache/accumulo/server/util/MasterMetadataUtil.java
index f60aa36..56112df 100644
---
a/server/base/src/main/java/org/apache/accumulo/server/util/MasterMetadataUtil.java
+++
b/server/base/src/main/java/org/apache/accumulo/server/util/MasterMetadataUtil.java
@@ -210,8 +210,8 @@ public class MasterMetadataUtil {
*/
public static StoredTabletFile updateTabletDataFile(ServerContext context,
KeyExtent extent,
TabletFile path, StoredTabletFile mergeFile, DataFileValue dfv,
MetadataTime time,
- Set filesInUseByScans, ZooLock zooLock,
- Set unusedWalLogs, long flushId) {
+ Set filesInUseByScans, ZooLock zooLock, Set
unusedWalLogs,
+ long flushId) {
TabletMutator tablet = context.getAmple().mutateTablet(extent);
StoredTabletFile newFile = null;
diff --git
a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/DatafileManager.java
b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/DatafileManager.java
index 4c0e9ed..6f5d71a 100644
---
a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/DatafileManager.java
+++
b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/DatafileManager.java
@@ -548,7 +548,7 @@ class DatafileManager {
if (filesInUseByScans.size() > 0)
log.debug("Adding scan refs to metadata {} {}", extent,
filesInUseByScans);
MasterMetadataUtil.replaceDatafiles(tablet.getContext(), extent,
oldDatafiles,
- filesInUseByScans, newFile, compactionId, dfv,
tablet.getTabletServer().getLock());
+filesInUseByScans, newFile, compactionId, dfv,
tablet.getTabletServer().getLock());
removeFilesAfterScan(filesInUseByScans);
if (log.isTraceEnabled()) {
diff --git
a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
index 9d237ac..effa25a 100644
---
a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
+++
b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
@@ -2684,9 +2684,9 @@ public class Tablet {
persistedTime = maxCommittedTime;
}
- return
MasterMetadataUtil.updateTabletDataFile(getTabletServer().getContext(), extent,
newDatafile,
- absMergeFile, dfv, tabletTime.getMetadataTime(persistedTime),
filesInUseByScans,
- tabletServer.getLock(), unusedWalLogs, flushId);
+ return
MasterMetadataUtil.updateTabletDataFile(getTabletServer().getContext(), extent,
+ newDatafile, absMergeFile, dfv,
tabletTime.getMetadataTime(persistedTime),
+ filesInUseByScans, tabletServer.getLock(), unusedWalLogs, flushId);
}
}
[accumulo] branch master updated: Update Last Location. Solution for #1169 (#1453)
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
The following commit(s) were added to refs/heads/master by this push:
new d12ff6c Update Last Location. Solution for #1169 (#1453)
d12ff6c is described below
commit d12ff6c700e003202fd2e9842499324561246b15
Author: Jeffrey Manno
AuthorDate: Mon Apr 6 10:36:44 2020 -0400
Update Last Location. Solution for #1169 (#1453)
* Add suspending tablets to ample and in stateStore Function
* remove functions not used and finalize changes for refactors
* remove collection from setFuture
* Deleted more unused code. Various requested changes
Co-authored-by: Jeffrey Manno
Co-authored-by: Mike Miller
---
.../accumulo/core/metadata/schema/Ample.java | 4 +
.../master/state/DistributedStoreException.java| 33 -
.../master/state/LoggingTabletStateStore.java | 21 ++--
.../server/master/state/MetaDataStateStore.java| 133 +++--
.../server/master/state/SuspendingTServer.java | 11 --
.../server/master/state/TServerInstance.java | 34 --
.../server/master/state/TabletStateStore.java | 23 ++--
.../server/master/state/ZooTabletStateStore.java | 26 ++--
.../server/metadata/TabletMutatorBase.java | 17 +++
.../accumulo/server/util/MasterMetadataUtil.java | 22 +---
.../master/state/RootTabletStateStoreTest.java | 13 +-
.../apache/accumulo/master/TabletGroupWatcher.java | 7 +-
.../org/apache/accumulo/tserver/TabletServer.java | 5 +-
.../accumulo/tserver/tablet/DatafileManager.java | 4 +-
.../org/apache/accumulo/tserver/tablet/Tablet.java | 7 +-
.../test/MasterRepairsDualAssignmentIT.java| 24 ++--
.../accumulo/test/functional/SplitRecoveryIT.java | 12 +-
.../apache/accumulo/test/master/MergeStateIT.java | 6 +-
.../accumulo/test/performance/NullTserver.java | 9 +-
19 files changed, 138 insertions(+), 273 deletions(-)
diff --git
a/core/src/main/java/org/apache/accumulo/core/metadata/schema/Ample.java
b/core/src/main/java/org/apache/accumulo/core/metadata/schema/Ample.java
index a7039d4..bd3eb09 100644
--- a/core/src/main/java/org/apache/accumulo/core/metadata/schema/Ample.java
+++ b/core/src/main/java/org/apache/accumulo/core/metadata/schema/Ample.java
@@ -222,6 +222,10 @@ public interface Ample {
public TabletMutator putChopped();
+public TabletMutator putSuspension(TServer tserver, long suspensionTime);
+
+public TabletMutator deleteSuspension();
+
/**
* This method persist (or queues for persisting) previous put and deletes
against this object.
* Unless this method is called, previous calls will never be persisted.
The purpose of this
diff --git
a/server/base/src/main/java/org/apache/accumulo/server/master/state/DistributedStoreException.java
b/server/base/src/main/java/org/apache/accumulo/server/master/state/DistributedStoreException.java
deleted file mode 100644
index a099bbf..000
---
a/server/base/src/main/java/org/apache/accumulo/server/master/state/DistributedStoreException.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.accumulo.server.master.state;
-
-public class DistributedStoreException extends Exception {
-
- private static final long serialVersionUID = 1L;
-
- public DistributedStoreException(String why) {
-super(why);
- }
-
- public DistributedStoreException(Exception cause) {
-super(cause);
- }
-
-}
diff --git
a/server/base/src/main/java/org/apache/accumulo/server/master/state/LoggingTabletStateStore.java
b/server/base/src/main/java/org/apache/accumulo/server/master/state/LoggingTabletStateStore.java
index 8b5fe1a..4249fc2 100644
---
a/server/base/src/main/java/org/apache/accumulo/server/master/state/LoggingTabletStateStore.java
+++
b/server/base/src/main/java/org/apache/accumulo/server/master/state/LoggingTabletStateStore.java
@@ -48,21 +48,21 @@ class LoggingTabletStateStore implements TabletStateStore {
}
@Override
- public void setFutureLocations(Collection assignments)
-
[accumulo] branch master updated (e49682e -> 27acec1)
This is an automated email from the ASF dual-hosted git repository. drew pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/accumulo.git. from e49682e Minor improvements / fix warning add 27acec1 Closes #1053 add multi-volume support to import table No new revisions were added by this update. Summary of changes: .../core/clientImpl/TableOperationsImpl.java | 57 - .../tableOps/tableImport/CreateImportDir.java | 47 +--- .../tableOps/tableImport/FinishImportTable.java| 8 +- .../tableImport/ImportPopulateZookeeper.java | 3 +- .../master/tableOps/tableImport/ImportTable.java | 57 +++-- .../tableOps/tableImport/ImportedTableInfo.java| 12 +- .../tableOps/tableImport/MapImportFileNames.java | 93 +++--- .../tableOps/tableImport/MoveExportedFiles.java| 95 --- .../tableImport/PopulateMetadataTable.java | 42 --- .../tableOps/tableImport/ImportTableTest.java | 134 + .../org/apache/accumulo/test/ImportExportIT.java | 26 ++-- 11 files changed, 421 insertions(+), 153 deletions(-) create mode 100644 server/master/src/test/java/org/apache/accumulo/master/tableOps/tableImport/ImportTableTest.java
