This is an automated email from the ASF dual-hosted git repository.
aonishuk pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push:
new 10706cb AMBARI-24647. [PERF] Host checks taking longer time than
previous releases (aonishuk)
10706cb is described below
commit 10706cb851cba628f3fd415620e82dce955a66b9
Author: Andrew Onishuk <[email protected]>
AuthorDate: Mon Sep 17 11:10:54 2018 +0300
AMBARI-24647. [PERF] Host checks taking longer time than previous releases
(aonishuk)
---
.../src/main/resources/stacks/PERF/check_host.sed | 20 ++++++++++++++++++++
contrib/utils/perf/deploy-gce-perf-cluster.py | 7 ++++---
2 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/ambari-server/src/main/resources/stacks/PERF/check_host.sed
b/ambari-server/src/main/resources/stacks/PERF/check_host.sed
new file mode 100644
index 0000000..2e41c70
--- /dev/null
+++ b/ambari-server/src/main/resources/stacks/PERF/check_host.sed
@@ -0,0 +1,20 @@
+# 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.
+/ Logger.info("Check execute list: " + str(check_execute_list))/{i\
+ if CHECK_INSTALLED_PACKAGES in check_execute_list:
check_execute_list.remove(CHECK_INSTALLED_PACKAGES)\
+ if CHECK_INSTALLED_PACKAGES in check_execute_list:
check_execute_list.remove(CHECK_EXISTING_REPOS)\
+ Logger.info("Check execute list: " + str(check_execute_list))
+d
+}
\ No newline at end of file
diff --git a/contrib/utils/perf/deploy-gce-perf-cluster.py
b/contrib/utils/perf/deploy-gce-perf-cluster.py
index beab106..a1259eb 100644
--- a/contrib/utils/perf/deploy-gce-perf-cluster.py
+++ b/contrib/utils/perf/deploy-gce-perf-cluster.py
@@ -28,7 +28,7 @@ import re
import socket
cluster_prefix = "perf"
-ambari_repo_file_url =
"http://s3.amazonaws.com/dev.hortonworks.com/ambari/centos7/2.x/updates/2.6.2.0/ambaribn.repo";
+ambari_repo_file_url =
"http://s3.amazonaws.com/dev.hortonworks.com/ambari/centos7/2.x/updates/2.7.1.0/ambaribn.repo";
public_hostname_script = "foo"
hostname_script = "foo"
@@ -280,7 +280,7 @@ def create_vms(args, number_of_nodes):
:param number_of_nodes: Number of VMs to request.
"""
print "Creating server VM {0}-server-{1} with xxlarge nodes on
centos7...".format(cluster_prefix, args.cluster_suffix)
- execute_command(args, args.controller, "/opt/gce-utils/gce up {0}-server-{1}
1 --centos7 --xlarge --ex --disk-xxlarge --ssd".format(cluster_prefix,
args.cluster_suffix),
+ execute_command(args, args.controller, "/opt/gce-utils/gce up {0}-server-{1}
1 --centos7 --xxlarge --ex --disk-xxlarge --ssd".format(cluster_prefix,
args.cluster_suffix),
"Failed to create server, probably not enough resources!",
"-tt")
time.sleep(10)
@@ -405,7 +405,8 @@ def create_agent_script(server_host_name):
"yum clean all; yum install krb5-workstation git ambari-agent -y\n" + \
"mkdir /home ; cd /home; git clone https://github.com/apache/ambari.git ; cd
ambari ; git checkout branch-2.5\n" + \
"cp -r /home/ambari/ambari-server/src/main/resources/stacks/PERF
/var/lib/ambari-agent/cache/stacks/PERF\n" + \
- "sed -i -f /var/lib/ambari-agent/cache/stacks/PERF/PythonExecutor.sed
/usr/lib/python2.6/site-packages/ambari_agent/PythonExecutor.py\n" + \
+ "sed -i -f /var/lib/ambari-agent/cache/stacks/PERF/PythonExecutor.sed
/usr/lib/ambari-agent/lib/ambari_agent/PythonExecutor.py\n" + \
+ "sed -i -f /var/lib/ambari-agent/cache/stacks/PERF/check_host.sed
/var/lib/ambari-agent/cache/custom_actions/scripts/check_host.py\n" + \
"sed -i -e 's/hostname=localhost/hostname={0}/g'
/etc/ambari-agent/conf/ambari-agent.ini\n".format(server_host_name) + \
"sed -i -e
's/agent]/agent]\\nhostname_script={0}\\npublic_hostname_script={1}\\n/1'
/etc/ambari-agent/conf/ambari-agent.ini\n".format(hostname_script,
public_hostname_script) + \
"python /home/ambari/ambari-agent/conf/unix/agent-multiplier.py start\n" + \
