ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From oleew...@apache.org
Subject ambari git commit: AMBARI-16892. Log Search Server start failed with KeeperException (oleewere)
Date Thu, 26 May 2016 13:50:49 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk f80107a7a -> 00a47c4c5


AMBARI-16892. Log Search Server start failed with KeeperException (oleewere)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/00a47c4c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/00a47c4c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/00a47c4c

Branch: refs/heads/trunk
Commit: 00a47c4c5dfadd804d32b3804d99b333c0e35fdf
Parents: f80107a
Author: oleewere <oleewere@gmail.com>
Authored: Thu May 26 15:34:50 2016 +0200
Committer: oleewere <oleewere@gmail.com>
Committed: Thu May 26 15:42:42 2016 +0200

----------------------------------------------------------------------
 .../LOGSEARCH/0.5.0/package/scripts/setup_logsearch.py  |  2 +-
 .../RANGER/0.4.0/package/scripts/setup_ranger_xml.py    |  4 ++--
 .../test/python/stacks/2.4/LOGSEARCH/test_logsearch.py  | 12 ++++++------
 .../src/test/python/stacks/2.4/configs/default.json     |  3 +++
 4 files changed, 12 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/00a47c4c/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/scripts/setup_logsearch.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/scripts/setup_logsearch.py
b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/scripts/setup_logsearch.py
index 2828ca9..58239c7 100644
--- a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/scripts/setup_logsearch.py
+++ b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/scripts/setup_logsearch.py
@@ -92,7 +92,7 @@ def upload_conf_set(config_set, random_num):
   tmp_config_set_folder = format('{tmp_dir}/solr_config_{config_set}_{random_num}')
 
   solr_cloud_util.upload_configuration_to_zk(
-    zookeeper_quorum=params.zookeeper_hosts,
+    zookeeper_quorum=params.zookeeper_quorum,
     solr_znode=params.logsearch_solr_znode,
     config_set_dir=format("{logsearch_server_conf}/solr_configsets/{config_set}/conf"),
     config_set=config_set,

http://git-wip-us.apache.org/repos/asf/ambari/blob/00a47c4c/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/setup_ranger_xml.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/setup_ranger_xml.py
b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/setup_ranger_xml.py
index f06f58a..665fa48 100644
--- a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/setup_ranger_xml.py
+++ b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/setup_ranger_xml.py
@@ -536,7 +536,7 @@ def setup_ranger_audit_solr():
   tmp_config_set_folder = format('{tmp_dir}/ranger_config_{ranger_solr_config_set}_{random_num}')
 
   solr_cloud_util.upload_configuration_to_zk(
-    zookeeper_quorum = params.zookeeper_hosts,
+    zookeeper_quorum = params.zookeeper_quorum,
     solr_znode = params.logsearch_solr_znode,
     config_set = params.ranger_solr_config_set,
     config_set_dir = params.ranger_solr_conf,
@@ -546,7 +546,7 @@ def setup_ranger_audit_solr():
     group = params.unix_group)
 
   solr_cloud_util.create_collection(
-    zookeeper_quorum = params.zookeeper_hosts,
+    zookeeper_quorum = params.zookeeper_quorum,
     solr_znode = params.logsearch_solr_znode,
     collection = params.ranger_solr_collection_name,
     config_set = params.ranger_solr_config_set,

http://git-wip-us.apache.org/repos/asf/ambari/blob/00a47c4c/ambari-server/src/test/python/stacks/2.4/LOGSEARCH/test_logsearch.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.4/LOGSEARCH/test_logsearch.py b/ambari-server/src/test/python/stacks/2.4/LOGSEARCH/test_logsearch.py
index f1e5efd..ddf380c 100644
--- a/ambari-server/src/test/python/stacks/2.4/LOGSEARCH/test_logsearch.py
+++ b/ambari-server/src/test/python/stacks/2.4/LOGSEARCH/test_logsearch.py
@@ -97,14 +97,14 @@ class TestLogSearch(RMFTestCase):
                               content = InlineTemplate(self.getConfig()['configurations']['logsearch-audit_logs-solrconfig']['content'])
                               )
 
-    self.assertResourceCalledRegexp('^Execute$', '^export JAVA_HOME=/usr/jdk64/jdk1.7.0_45
; /usr/lib/ambari-logsearch-solr-client/solrCloudCli.sh -z c6401.ambari.apache.org/logsearch
--download-config -d /tmp/solr_config_hadoop_logs_0.[0-9]* -cs hadoop_logs -rt 5 -i 10')
-    self.assertResourceCalledRegexp('^Execute$', '^export JAVA_HOME=/usr/jdk64/jdk1.7.0_45
; /usr/lib/ambari-logsearch-solr-client/solrCloudCli.sh -z c6401.ambari.apache.org/logsearch
--upload-config -d /etc/ambari-logsearch-portal/conf/solr_configsets/hadoop_logs/conf -cs
hadoop_logs -rt 5 -i 10')
+    self.assertResourceCalledRegexp('^Execute$', '^export JAVA_HOME=/usr/jdk64/jdk1.7.0_45
; /usr/lib/ambari-logsearch-solr-client/solrCloudCli.sh -z c6401.ambari.apache.org:2181/logsearch
--download-config -d /tmp/solr_config_hadoop_logs_0.[0-9]* -cs hadoop_logs -rt 5 -i 10')
+    self.assertResourceCalledRegexp('^Execute$', '^export JAVA_HOME=/usr/jdk64/jdk1.7.0_45
; /usr/lib/ambari-logsearch-solr-client/solrCloudCli.sh -z c6401.ambari.apache.org:2181/logsearch
--upload-config -d /etc/ambari-logsearch-portal/conf/solr_configsets/hadoop_logs/conf -cs
hadoop_logs -rt 5 -i 10')
 
-    self.assertResourceCalledRegexp('^Execute$', '^export JAVA_HOME=/usr/jdk64/jdk1.7.0_45
; /usr/lib/ambari-logsearch-solr-client/solrCloudCli.sh -z c6401.ambari.apache.org/logsearch
--download-config -d /tmp/solr_config_history_0.[0-9]* -cs history -rt 5 -i 10')
-    self.assertResourceCalledRegexp('^Execute$', '^export JAVA_HOME=/usr/jdk64/jdk1.7.0_45
; /usr/lib/ambari-logsearch-solr-client/solrCloudCli.sh -z c6401.ambari.apache.org/logsearch
--upload-config -d /etc/ambari-logsearch-portal/conf/solr_configsets/history/conf -cs history
-rt 5 -i 10')
+    self.assertResourceCalledRegexp('^Execute$', '^export JAVA_HOME=/usr/jdk64/jdk1.7.0_45
; /usr/lib/ambari-logsearch-solr-client/solrCloudCli.sh -z c6401.ambari.apache.org:2181/logsearch
--download-config -d /tmp/solr_config_history_0.[0-9]* -cs history -rt 5 -i 10')
+    self.assertResourceCalledRegexp('^Execute$', '^export JAVA_HOME=/usr/jdk64/jdk1.7.0_45
; /usr/lib/ambari-logsearch-solr-client/solrCloudCli.sh -z c6401.ambari.apache.org:2181/logsearch
--upload-config -d /etc/ambari-logsearch-portal/conf/solr_configsets/history/conf -cs history
-rt 5 -i 10')
 
-    self.assertResourceCalledRegexp('^Execute$', '^export JAVA_HOME=/usr/jdk64/jdk1.7.0_45
; /usr/lib/ambari-logsearch-solr-client/solrCloudCli.sh -z c6401.ambari.apache.org/logsearch
--download-config -d /tmp/solr_config_audit_logs_0.[0-9]* -cs audit_logs -rt 5 -i 10')
-    self.assertResourceCalledRegexp('^Execute$', '^export JAVA_HOME=/usr/jdk64/jdk1.7.0_45
; /usr/lib/ambari-logsearch-solr-client/solrCloudCli.sh -z c6401.ambari.apache.org/logsearch
--upload-config -d /etc/ambari-logsearch-portal/conf/solr_configsets/audit_logs/conf -cs audit_logs
-rt 5 -i 10')
+    self.assertResourceCalledRegexp('^Execute$', '^export JAVA_HOME=/usr/jdk64/jdk1.7.0_45
; /usr/lib/ambari-logsearch-solr-client/solrCloudCli.sh -z c6401.ambari.apache.org:2181/logsearch
--download-config -d /tmp/solr_config_audit_logs_0.[0-9]* -cs audit_logs -rt 5 -i 10')
+    self.assertResourceCalledRegexp('^Execute$', '^export JAVA_HOME=/usr/jdk64/jdk1.7.0_45
; /usr/lib/ambari-logsearch-solr-client/solrCloudCli.sh -z c6401.ambari.apache.org:2181/logsearch
--upload-config -d /etc/ambari-logsearch-portal/conf/solr_configsets/audit_logs/conf -cs audit_logs
-rt 5 -i 10')
 
     self.assertResourceCalled('Execute', ('chmod', '-R', 'ugo+r', '/etc/ambari-logsearch-portal/conf/solr_configsets'),
                               sudo=True

http://git-wip-us.apache.org/repos/asf/ambari/blob/00a47c4c/ambari-server/src/test/python/stacks/2.4/configs/default.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.4/configs/default.json b/ambari-server/src/test/python/stacks/2.4/configs/default.json
index 7379082..5c1c8d1 100644
--- a/ambari-server/src/test/python/stacks/2.4/configs/default.json
+++ b/ambari-server/src/test/python/stacks/2.4/configs/default.json
@@ -221,6 +221,9 @@
       "ranger-env": {
             "xml_configurations_supported" : "true"
       },
+      "zoo.cfg": {
+        "clientPort": "2181"
+      },
       "logsearch-admin-json" : {
         "logsearch_admin_username" : "admin",
         "logsearch_admin_password" : "admin",


Mime
View raw message