From 2165dde60827a1b7a9dc7c4c78f8e183bc04b104 Mon Sep 17 00:00:00 2001 From: milleruntime Date: Fri, 9 Sep 2016 13:53:51 -0400 Subject: [PATCH 1/2] ACCUMULO-2972: fixed description for instance.secret --- .../main/java/org/apache/accumulo/core/conf/Property.java | 5 +++-- 1 file changed, 3 insertions(+), 2 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 5fff17fd89e..b56482502f0 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 @@ -123,8 +123,9 @@ public enum Property { @Sensitive INSTANCE_SECRET("instance.secret", "DEFAULT", PropertyType.STRING, "A secret unique to a given instance that all servers must know in order to communicate with one another." - + " Change it before initialization. To change it later use ./bin/accumulo accumulo.server.util.ChangeSecret [oldpasswd] [newpasswd], " - + " and then update conf/accumulo-site.xml everywhere."), + + "Change it before initialization. To change it later use the ChangeSecret tool and then update conf/accumulo-site.xml everywhere." + + "Before using the ChangeSecret tool, make sure Accumulo is not running and you are logged in as the user that controls Accumulo files in HDFS." + + "To use the ChangeSecret tool, run the command: ./bin/accumulo accumulo.server.util.ChangeSecret"), INSTANCE_VOLUMES("instance.volumes", "", PropertyType.STRING, "A comma seperated list of dfs uris to use. Files will be stored across these filesystems. If this is empty, then instance.dfs.uri will be used. " + "After adding uris to this list, run 'accumulo init --add-volume' and then restart tservers. If entries are removed from this list then tservers " From 0ecc47161cc5b019f856dccd78bec48c4ba70e13 Mon Sep 17 00:00:00 2001 From: milleruntime Date: Fri, 9 Sep 2016 14:07:28 -0400 Subject: [PATCH 2/2] ACCUMULO-2972: correction to description for instance.secret --- .../main/java/org/apache/accumulo/core/conf/Property.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 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 b56482502f0..def13dc892a 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 @@ -123,9 +123,10 @@ public enum Property { @Sensitive INSTANCE_SECRET("instance.secret", "DEFAULT", PropertyType.STRING, "A secret unique to a given instance that all servers must know in order to communicate with one another." - + "Change it before initialization. To change it later use the ChangeSecret tool and then update conf/accumulo-site.xml everywhere." - + "Before using the ChangeSecret tool, make sure Accumulo is not running and you are logged in as the user that controls Accumulo files in HDFS." - + "To use the ChangeSecret tool, run the command: ./bin/accumulo accumulo.server.util.ChangeSecret"), + + "It should be changed prior to the initialization of Accumulo. To change it after Accumulo has been initialized, use the ChangeSecret tool " + + "and then update conf/accumulo-site.xml everywhere. Before using the ChangeSecret tool, make sure Accumulo is not running and you are logged " + + "in as the user that controls Accumulo files in HDFS. To use the ChangeSecret tool, run the command: " + + "./bin/accumulo org.apache.accumulo.server.util.ChangeSecret"), INSTANCE_VOLUMES("instance.volumes", "", PropertyType.STRING, "A comma seperated list of dfs uris to use. Files will be stored across these filesystems. If this is empty, then instance.dfs.uri will be used. " + "After adding uris to this list, run 'accumulo init --add-volume' and then restart tservers. If entries are removed from this list then tservers "