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 cbc557e Fix #597 Allow general.custom. props in ZK
cbc557e is described below
commit cbc557e0db3107f924676f3a9fc1de5892e34f01
Author: Christopher Tubbs <ctubb...@apache.org>
AuthorDate: Fri Aug 10 19:45:55 2018 -0400
Fix #597 Allow general.custom. props in ZK
* Allow general.custom.* properties to be set in the system-wide
ZooKeeper store
* Remove check for monitor banner properties, which no longer exist
* Remove unused variables leftover from previous work
---
core/src/main/java/org/apache/accumulo/core/conf/Property.java | 2 +-
.../java/org/apache/accumulo/server/tablets/UniqueNameAllocator.java | 2 --
.../apache/accumulo/server/constraints/MetadataConstraintsTest.java | 4 ----
.../src/main/java/org/apache/accumulo/tserver/tablet/TabletData.java | 3 ---
4 files changed, 1 insertion(+), 10 deletions(-)
diff --git a/core/src/main/java/org/apache/accumulo/core/conf/Property.java
b/core/src/main/java/org/apache/accumulo/core/conf/Property.java
index a1754c4..caa638c 100644
--- a/core/src/main/java/org/apache/accumulo/core/conf/Property.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/Property.java
@@ -1228,7 +1228,7 @@ public enum Property {
|| key.startsWith(Property.TSERV_PREFIX.getKey())
|| key.startsWith(Property.MASTER_PREFIX.getKey())
|| key.startsWith(Property.GC_PREFIX.getKey())
- || key.startsWith(Property.MONITOR_PREFIX.getKey() + "banner.")
+ || key.startsWith(Property.GENERAL_ARBITRARY_PROP_PREFIX.getKey())
|| key.startsWith(VFS_CONTEXT_CLASSPATH_PROPERTY.getKey())
|| key.startsWith(REPLICATION_PREFIX.getKey());
}
diff --git
a/server/base/src/main/java/org/apache/accumulo/server/tablets/UniqueNameAllocator.java
b/server/base/src/main/java/org/apache/accumulo/server/tablets/UniqueNameAllocator.java
index 05380a4..9382957 100644
---
a/server/base/src/main/java/org/apache/accumulo/server/tablets/UniqueNameAllocator.java
+++
b/server/base/src/main/java/org/apache/accumulo/server/tablets/UniqueNameAllocator.java
@@ -34,14 +34,12 @@ import org.apache.accumulo.server.zookeeper.ZooReaderWriter;
*/
public class UniqueNameAllocator {
- private ServerContext context;
private long next = 0;
private long maxAllocated = 0;
private String nextNamePath;
private Random rand;
public UniqueNameAllocator(ServerContext context) {
- this.context = context;
nextNamePath = Constants.ZROOT + "/" + context.getInstanceID() +
Constants.ZNEXT_FILE;
rand = new Random();
}
diff --git
a/server/base/src/test/java/org/apache/accumulo/server/constraints/MetadataConstraintsTest.java
b/server/base/src/test/java/org/apache/accumulo/server/constraints/MetadataConstraintsTest.java
index 6e9733e..8b5e7b9 100644
---
a/server/base/src/test/java/org/apache/accumulo/server/constraints/MetadataConstraintsTest.java
+++
b/server/base/src/test/java/org/apache/accumulo/server/constraints/MetadataConstraintsTest.java
@@ -29,11 +29,9 @@ import
org.apache.accumulo.core.metadata.schema.DataFileValue;
import org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection;
import
org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.DataFileColumnFamily;
import org.apache.accumulo.fate.zookeeper.TransactionWatcher.Arbitrator;
-import org.apache.accumulo.server.ServerContext;
import org.apache.hadoop.io.Text;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
-import org.easymock.EasyMock;
import org.junit.Test;
public class MetadataConstraintsTest {
@@ -64,8 +62,6 @@ public class MetadataConstraintsTest {
Mutation m = new Mutation(new Text("0;foo"));
TabletsSection.TabletColumnFamily.PREV_ROW_COLUMN.put(m, new
Value("1foo".getBytes()));
- ServerContext context = EasyMock.createMock(ServerContext.class);
-
MetadataConstraints mc = new MetadataConstraints();
List<Short> violations = mc.check(null, m);
diff --git
a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/TabletData.java
b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/TabletData.java
index f7a01f8..396648f 100644
---
a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/TabletData.java
+++
b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/TabletData.java
@@ -69,7 +69,6 @@ import org.slf4j.LoggerFactory;
public class TabletData {
private static Logger log = LoggerFactory.getLogger(TabletData.class);
- private ServerContext context;
private String time = null;
private SortedMap<FileRef,DataFileValue> dataFiles = new TreeMap<>();
private List<LogEntry> logEntries = new ArrayList<>();
@@ -84,7 +83,6 @@ public class TabletData {
// Read tablet data from metadata tables
public TabletData(ServerContext context, KeyExtent extent, VolumeManager fs,
Iterator<Entry<Key,Value>> entries) {
- this.context = context;
final Text family = new Text();
Text rowName = extent.getMetadataEntry();
while (entries.hasNext()) {
@@ -138,7 +136,6 @@ public class TabletData {
// Read basic root table metadata from zookeeper
public TabletData(ServerContext context, VolumeManager fs, ZooReader rdr,
AccumuloConfiguration conf) throws IOException {
- this.context = context;
directory = VolumeUtil.switchRootTableVolume(context,
MetadataTableUtil.getRootTabletDir(context));
