rpms/accumulo
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Another fix for Shell erroneously reading accumulo-site.xml

Browse source
This commit is contained in:
Mike Miller 2016-12-05 20:55:37 +00:00
commit 7f2e6dc3c8
2 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
accumulo.spec
View file

@ -6,7 +6,7 @@
Name: accumulo
Version: 1.6.6
Release: 11%{?dist}
Release: 12%{?dist}
Summary: A software platform for processing vast amounts of data
License: ASL 2.0
Group: Development/Libraries
@ -517,6 +517,9 @@ getent passwd %{name} >/dev/null || /usr/sbin/useradd --comment "%{longproj}" --
%systemd_post %{name}-monitor.service
%changelog
* Mon Dec 05 2016 Mike Miller <milleruntime@fedoraproject.org> - 1.6.6-12
- Another fix for Shell erroneously reading accumulo-site.xml
* Fri Dec 02 2016 Christopher Tubbs <ctubbsii@fedoraproject.org> - 1.6.6-11
- Vastly simplify out-of-box configuration and fix missing avro jar

11
shell-not-read-conf.patch
View file

@ -21,10 +21,10 @@ index 9231c78..233fbae 100644
if (instanceName == null) {
Path instanceDir = new Path(VolumeConfiguration.getVolumeUris(conf)[0], "instance_id");
diff --git a/core/src/main/java/org/apache/accumulo/core/util/shell/ShellOptionsJC.java b/core/src/main/java/org/apache/accumulo/core/util/shell/ShellOptionsJC.java
index 2045eba..1b44a00 100644
index 2045eba..30b3e1e 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/shell/ShellOptionsJC.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/shell/ShellOptionsJC.java
@@ -280,6 +280,13 @@ public class ShellOptionsJC {
@@ -280,7 +280,20 @@ public class ShellOptionsJC {
if (useSsl()) {
clientConfig.setProperty(ClientProperty.INSTANCE_RPC_SSL_ENABLED, "true");
}
@ -36,5 +36,12 @@ index 2045eba..1b44a00 100644
+ clientConfig.setProperty(ClientProperty.INSTANCE_NAME, instanceName);
+ }
+ if (zooKeeperInstanceName != null && !getZooKeeperInstanceName().isEmpty()) {
+ clientConfig.setProperty(ClientProperty.INSTANCE_NAME, getZooKeeperInstanceName());
+ }
+ if (zooKeeperHosts != null && !getZooKeeperHosts().isEmpty()) {
+ clientConfig.setProperty(ClientProperty.INSTANCE_ZK_HOST, getZooKeeperHosts());
+ }
// Automatically try to add in the proper ZK from accumulo-site for backwards compat.
if (!clientConfig.containsKey(ClientProperty.INSTANCE_ZK_HOST.getKey())) {
AccumuloConfiguration siteConf = SiteConfiguration.getInstance(ServerConfigurationUtil.convertClientConfig(DefaultConfiguration.getInstance(),