You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ds...@apache.org on 2013/11/01 20:13:02 UTC
git commit: AMBARI-3615. Ambari agent creates empty folder
/var/ambari-agent (dsen)
Updated Branches:
refs/heads/trunk aa8e98f46 -> 506adf751
AMBARI-3615. Ambari agent creates empty folder /var/ambari-agent (dsen)
Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/506adf75
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/506adf75
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/506adf75
Branch: refs/heads/trunk
Commit: 506adf75119333ecbde5997b203927275d03cd32
Parents: aa8e98f
Author: Dmitry Sen <ds...@hortonworks.com>
Authored: Fri Nov 1 21:12:25 2013 +0200
Committer: Dmitry Sen <ds...@hortonworks.com>
Committed: Fri Nov 1 21:12:48 2013 +0200
----------------------------------------------------------------------
ambari-agent/conf/unix/ambari-agent.ini | 4 ----
ambari-agent/pom.xml | 17 ---------------
.../main/python/ambari_agent/AmbariConfig.py | 4 ----
.../src/main/python/ambari_agent/main.py | 3 ---
.../src/main/python/ambari_agent/shell.py | 11 ----------
.../DATANODE/upgrade.d/50-hadoop-upgrade.pp | 23 --------------------
.../HDP-1.2_HDP-1.3/GANGLIA_MONITOR/stub.txt | 19 ----------------
.../HDP-1.2_HDP-1.3/GANGLIA_SERVER/stub.txt | 19 ----------------
.../HDP-1.2_HDP-1.3/HADOOP_CLIENT/stub.txt | 19 ----------------
.../HBASE_CLIENT/upgrade.d/50-hbase-upgrade.pp | 23 --------------------
.../HBASE_MASTER/upgrade.d/50-hbase-upgrade.pp | 23 --------------------
.../upgrade.d/50-hbase-upgrade.pp | 23 --------------------
.../HCAT/upgrade.d/50-hcat-upgrade.pp | 23 --------------------
.../HDFS_CLIENT/upgrade.d/50-hadoop-upgrade.pp | 23 --------------------
.../HIVE_CLIENT/upgrade.d/50-hive-upgrade.pp | 23 --------------------
.../HIVE_METASTORE/upgrade.d/50-hive-upgrade.pp | 23 --------------------
.../HIVE_SERVER/upgrade.d/50-hive-upgrade.pp | 23 --------------------
.../HDP-1.2_HDP-1.3/HUE_SERVER/stub.txt | 19 ----------------
.../JOBTRACKER/upgrade.d/50-hadoop-upgrade.pp | 23 --------------------
.../upgrade.d/50-hadoop-upgrade.pp | 23 --------------------
.../HDP-1.2_HDP-1.3/MONITOR_WEBSERVER/stub.txt | 19 ----------------
.../HDP-1.2_HDP-1.3/MYSQL_SERVER/stub.txt | 19 ----------------
.../HDP-1.2_HDP-1.3/NAGIOS_SERVER/stub.txt | 19 ----------------
.../NAMENODE/upgrade.d/50-hadoop-upgrade.pp | 23 --------------------
.../upgrade.d/50-oozie-client-upgrade.pp | 23 --------------------
.../OOZIE_SERVER/upgrade.d/50-oozie-upgrade.pp | 23 --------------------
.../PIG/upgrade.d/50-pig-upgrade.pp | 23 --------------------
.../upgrade.d/50-hadoop-upgrade.pp | 23 --------------------
.../SQOOP/upgrade.d/50-sqoop-upgrade.pp | 23 --------------------
.../TASKTRACKER/upgrade.d/50-hadoop-upgrade.pp | 23 --------------------
.../upgrade.d/50-webhcat-upgrade.pp | 23 --------------------
.../upgrade.d/50-zookeeper-upgrade.pp | 23 --------------------
.../upgrade.d/50-zookeeper-upgrade.pp | 23 --------------------
ambari-agent/src/test/python/TestHardware.py | 15 ++++++++-----
ambari-agent/src/test/python/TestMain.py | 4 +---
.../src/test/python/TestPuppetExecutor.py | 6 ++---
ambari-agent/src/test/python/TestShell.py | 10 ---------
.../test/python/examples/ControllerTester.py | 4 ----
38 files changed, 13 insertions(+), 681 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/506adf75/ambari-agent/conf/unix/ambari-agent.ini
----------------------------------------------------------------------
diff --git a/ambari-agent/conf/unix/ambari-agent.ini b/ambari-agent/conf/unix/ambari-agent.ini
index ca94ba1..6672dfa 100644
--- a/ambari-agent/conf/unix/ambari-agent.ini
+++ b/ambari-agent/conf/unix/ambari-agent.ini
@@ -26,10 +26,6 @@ data_cleanup_max_age=2592000
ping_port=8670
cache_dir=/var/lib/ambari-agent/cache
-[stack]
-installprefix=/var/ambari-agent/
-upgradeScriptsDir=/var/lib/ambari-agent/upgrade_stack
-
[puppet]
puppetmodules=/var/lib/ambari-agent/puppet
ruby_home=/usr/lib/ambari-agent/lib/ruby-1.8.7-p370
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/506adf75/ambari-agent/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-agent/pom.xml b/ambari-agent/pom.xml
index e05eba4..e6e8c72 100644
--- a/ambari-agent/pom.xml
+++ b/ambari-agent/pom.xml
@@ -254,17 +254,6 @@
</sources>
</mapping>
<mapping>
- <directory>/var/lib/${project.artifactId}/upgrade_stack</directory>
- <filemode>755</filemode>
- <username>root</username>
- <groupname>root</groupname>
- <sources>
- <source>
- <location>src/main/upgrade_stack</location>
- </source>
- </sources>
- </mapping>
- <mapping>
<directory>/etc/ambari-agent/conf</directory>
<filemode>755</filemode>
<username>root</username>
@@ -323,12 +312,6 @@
<groupname>root</groupname>
</mapping>
<mapping>
- <directory>/var/ambari-agent</directory>
- <filemode>755</filemode>
- <username>root</username>
- <groupname>root</groupname>
- </mapping>
- <mapping>
<directory>/etc/rc.d/init.d</directory>
<filemode>755</filemode>
<username>root</username>
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/506adf75/ambari-agent/src/main/python/ambari_agent/AmbariConfig.py
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/python/ambari_agent/AmbariConfig.py b/ambari-agent/src/main/python/ambari_agent/AmbariConfig.py
index ed507ce..aca7856 100644
--- a/ambari-agent/src/main/python/ambari_agent/AmbariConfig.py
+++ b/ambari-agent/src/main/python/ambari_agent/AmbariConfig.py
@@ -38,10 +38,6 @@ cache_dir=/var/lib/ambari-agent/cache
[services]
-[stack]
-installprefix=/tmp
-upgradeScriptsDir=/var/lib/ambari-agent/upgrade_stack
-
[puppet]
puppetmodules=/var/lib/ambari-agent/puppet/
puppet_home=/root/workspace/puppet-install/puppet-2.7.9
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/506adf75/ambari-agent/src/main/python/ambari_agent/main.py
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/python/ambari_agent/main.py b/ambari-agent/src/main/python/ambari_agent/main.py
index c86901b..b979099 100644
--- a/ambari-agent/src/main/python/ambari_agent/main.py
+++ b/ambari-agent/src/main/python/ambari_agent/main.py
@@ -29,7 +29,6 @@ import time
import ConfigParser
import ProcessHelper
from Controller import Controller
-from shell import killstaleprocesses
import AmbariConfig
from security import CertificateManager
from NetUtil import NetUtil
@@ -208,8 +207,6 @@ def main():
perform_prestart_checks(expected_hostname)
daemonize()
- killstaleprocesses()
-
# Starting ping port listener
ping_port_listener = PingPortListener(config)
ping_port_listener.start()
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/506adf75/ambari-agent/src/main/python/ambari_agent/shell.py
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/python/ambari_agent/shell.py b/ambari-agent/src/main/python/ambari_agent/shell.py
index 95a16ad..5e0e7ae 100644
--- a/ambari-agent/src/main/python/ambari_agent/shell.py
+++ b/ambari-agent/src/main/python/ambari_agent/shell.py
@@ -48,17 +48,6 @@ def noteTempFile(filename):
def getTempFiles():
return tempFiles
-def killstaleprocesses():
- logger.info ("Killing stale processes")
- prefix = AmbariConfig.config.get('stack','installprefix')
- files = os.listdir(prefix)
- for file in files:
- if str(file).endswith(".pid"):
- pid = str(file).split('.')[0]
- kill_process_with_children(int(pid))
- os.unlink(os.path.join(prefix,file))
- logger.info ("Killed stale processes")
-
def kill_process_with_children(parent_pid):
def kill_tree_function(pid, signal):
'''
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/506adf75/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/DATANODE/upgrade.d/50-hadoop-upgrade.pp
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/DATANODE/upgrade.d/50-hadoop-upgrade.pp b/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/DATANODE/upgrade.d/50-hadoop-upgrade.pp
deleted file mode 100644
index fe37211..0000000
--- a/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/DATANODE/upgrade.d/50-hadoop-upgrade.pp
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-#
-# 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.
-#
-#
-Package { ensure => "latest" }
-$packages = [ "hadoop", "hadoop-libhdfs", "hadoop-native", "hadoop-pipes", "hadoop-sbin", "hadoop-lzo", "hadoop-lzo-native" ]
-package { $packages: }
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/506adf75/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/GANGLIA_MONITOR/stub.txt
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/GANGLIA_MONITOR/stub.txt b/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/GANGLIA_MONITOR/stub.txt
deleted file mode 100644
index a1206d9..0000000
--- a/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/GANGLIA_MONITOR/stub.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * 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.
- */
-
-// Replace the folder content with actual files required for upgrade.
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/506adf75/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/GANGLIA_SERVER/stub.txt
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/GANGLIA_SERVER/stub.txt b/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/GANGLIA_SERVER/stub.txt
deleted file mode 100644
index a1206d9..0000000
--- a/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/GANGLIA_SERVER/stub.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * 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.
- */
-
-// Replace the folder content with actual files required for upgrade.
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/506adf75/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/HADOOP_CLIENT/stub.txt
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/HADOOP_CLIENT/stub.txt b/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/HADOOP_CLIENT/stub.txt
deleted file mode 100644
index a1206d9..0000000
--- a/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/HADOOP_CLIENT/stub.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * 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.
- */
-
-// Replace the folder content with actual files required for upgrade.
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/506adf75/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/HBASE_CLIENT/upgrade.d/50-hbase-upgrade.pp
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/HBASE_CLIENT/upgrade.d/50-hbase-upgrade.pp b/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/HBASE_CLIENT/upgrade.d/50-hbase-upgrade.pp
deleted file mode 100644
index 0f4515d..0000000
--- a/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/HBASE_CLIENT/upgrade.d/50-hbase-upgrade.pp
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-#
-# 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.
-#
-#
-Package { ensure => "latest" }
-$packages = [ "hbase" ]
-package { $packages: }
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/506adf75/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/HBASE_MASTER/upgrade.d/50-hbase-upgrade.pp
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/HBASE_MASTER/upgrade.d/50-hbase-upgrade.pp b/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/HBASE_MASTER/upgrade.d/50-hbase-upgrade.pp
deleted file mode 100644
index 0f4515d..0000000
--- a/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/HBASE_MASTER/upgrade.d/50-hbase-upgrade.pp
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-#
-# 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.
-#
-#
-Package { ensure => "latest" }
-$packages = [ "hbase" ]
-package { $packages: }
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/506adf75/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/HBASE_REGIONSERVER/upgrade.d/50-hbase-upgrade.pp
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/HBASE_REGIONSERVER/upgrade.d/50-hbase-upgrade.pp b/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/HBASE_REGIONSERVER/upgrade.d/50-hbase-upgrade.pp
deleted file mode 100644
index 0f4515d..0000000
--- a/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/HBASE_REGIONSERVER/upgrade.d/50-hbase-upgrade.pp
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-#
-# 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.
-#
-#
-Package { ensure => "latest" }
-$packages = [ "hbase" ]
-package { $packages: }
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/506adf75/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/HCAT/upgrade.d/50-hcat-upgrade.pp
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/HCAT/upgrade.d/50-hcat-upgrade.pp b/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/HCAT/upgrade.d/50-hcat-upgrade.pp
deleted file mode 100644
index 729f699..0000000
--- a/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/HCAT/upgrade.d/50-hcat-upgrade.pp
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-#
-# 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.
-#
-#
-Package { ensure => "latest" }
-$packages = [ "hcatalog" ]
-package { $packages: }
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/506adf75/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/HDFS_CLIENT/upgrade.d/50-hadoop-upgrade.pp
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/HDFS_CLIENT/upgrade.d/50-hadoop-upgrade.pp b/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/HDFS_CLIENT/upgrade.d/50-hadoop-upgrade.pp
deleted file mode 100644
index fe37211..0000000
--- a/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/HDFS_CLIENT/upgrade.d/50-hadoop-upgrade.pp
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-#
-# 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.
-#
-#
-Package { ensure => "latest" }
-$packages = [ "hadoop", "hadoop-libhdfs", "hadoop-native", "hadoop-pipes", "hadoop-sbin", "hadoop-lzo", "hadoop-lzo-native" ]
-package { $packages: }
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/506adf75/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/HIVE_CLIENT/upgrade.d/50-hive-upgrade.pp
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/HIVE_CLIENT/upgrade.d/50-hive-upgrade.pp b/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/HIVE_CLIENT/upgrade.d/50-hive-upgrade.pp
deleted file mode 100644
index 85fbe84..0000000
--- a/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/HIVE_CLIENT/upgrade.d/50-hive-upgrade.pp
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-#
-# 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.
-#
-#
-Package { ensure => "latest" }
-$packages = [ "hive" ]
-package { $packages: }
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/506adf75/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/HIVE_METASTORE/upgrade.d/50-hive-upgrade.pp
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/HIVE_METASTORE/upgrade.d/50-hive-upgrade.pp b/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/HIVE_METASTORE/upgrade.d/50-hive-upgrade.pp
deleted file mode 100644
index 85fbe84..0000000
--- a/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/HIVE_METASTORE/upgrade.d/50-hive-upgrade.pp
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-#
-# 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.
-#
-#
-Package { ensure => "latest" }
-$packages = [ "hive" ]
-package { $packages: }
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/506adf75/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/HIVE_SERVER/upgrade.d/50-hive-upgrade.pp
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/HIVE_SERVER/upgrade.d/50-hive-upgrade.pp b/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/HIVE_SERVER/upgrade.d/50-hive-upgrade.pp
deleted file mode 100644
index 85fbe84..0000000
--- a/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/HIVE_SERVER/upgrade.d/50-hive-upgrade.pp
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-#
-# 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.
-#
-#
-Package { ensure => "latest" }
-$packages = [ "hive" ]
-package { $packages: }
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/506adf75/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/HUE_SERVER/stub.txt
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/HUE_SERVER/stub.txt b/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/HUE_SERVER/stub.txt
deleted file mode 100644
index a1206d9..0000000
--- a/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/HUE_SERVER/stub.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * 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.
- */
-
-// Replace the folder content with actual files required for upgrade.
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/506adf75/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/JOBTRACKER/upgrade.d/50-hadoop-upgrade.pp
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/JOBTRACKER/upgrade.d/50-hadoop-upgrade.pp b/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/JOBTRACKER/upgrade.d/50-hadoop-upgrade.pp
deleted file mode 100644
index fe37211..0000000
--- a/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/JOBTRACKER/upgrade.d/50-hadoop-upgrade.pp
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-#
-# 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.
-#
-#
-Package { ensure => "latest" }
-$packages = [ "hadoop", "hadoop-libhdfs", "hadoop-native", "hadoop-pipes", "hadoop-sbin", "hadoop-lzo", "hadoop-lzo-native" ]
-package { $packages: }
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/506adf75/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/MAPREDUCE_CLIENT/upgrade.d/50-hadoop-upgrade.pp
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/MAPREDUCE_CLIENT/upgrade.d/50-hadoop-upgrade.pp b/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/MAPREDUCE_CLIENT/upgrade.d/50-hadoop-upgrade.pp
deleted file mode 100644
index fe37211..0000000
--- a/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/MAPREDUCE_CLIENT/upgrade.d/50-hadoop-upgrade.pp
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-#
-# 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.
-#
-#
-Package { ensure => "latest" }
-$packages = [ "hadoop", "hadoop-libhdfs", "hadoop-native", "hadoop-pipes", "hadoop-sbin", "hadoop-lzo", "hadoop-lzo-native" ]
-package { $packages: }
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/506adf75/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/MONITOR_WEBSERVER/stub.txt
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/MONITOR_WEBSERVER/stub.txt b/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/MONITOR_WEBSERVER/stub.txt
deleted file mode 100644
index a1206d9..0000000
--- a/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/MONITOR_WEBSERVER/stub.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * 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.
- */
-
-// Replace the folder content with actual files required for upgrade.
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/506adf75/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/MYSQL_SERVER/stub.txt
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/MYSQL_SERVER/stub.txt b/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/MYSQL_SERVER/stub.txt
deleted file mode 100644
index a1206d9..0000000
--- a/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/MYSQL_SERVER/stub.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * 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.
- */
-
-// Replace the folder content with actual files required for upgrade.
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/506adf75/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/NAGIOS_SERVER/stub.txt
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/NAGIOS_SERVER/stub.txt b/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/NAGIOS_SERVER/stub.txt
deleted file mode 100644
index a1206d9..0000000
--- a/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/NAGIOS_SERVER/stub.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * 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.
- */
-
-// Replace the folder content with actual files required for upgrade.
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/506adf75/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/NAMENODE/upgrade.d/50-hadoop-upgrade.pp
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/NAMENODE/upgrade.d/50-hadoop-upgrade.pp b/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/NAMENODE/upgrade.d/50-hadoop-upgrade.pp
deleted file mode 100644
index fe37211..0000000
--- a/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/NAMENODE/upgrade.d/50-hadoop-upgrade.pp
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-#
-# 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.
-#
-#
-Package { ensure => "latest" }
-$packages = [ "hadoop", "hadoop-libhdfs", "hadoop-native", "hadoop-pipes", "hadoop-sbin", "hadoop-lzo", "hadoop-lzo-native" ]
-package { $packages: }
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/506adf75/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/OOZIE_CLIENT/upgrade.d/50-oozie-client-upgrade.pp
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/OOZIE_CLIENT/upgrade.d/50-oozie-client-upgrade.pp b/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/OOZIE_CLIENT/upgrade.d/50-oozie-client-upgrade.pp
deleted file mode 100644
index 7190de5..0000000
--- a/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/OOZIE_CLIENT/upgrade.d/50-oozie-client-upgrade.pp
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-#
-# 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.
-#
-#
-Package { ensure => "latest" }
-$packages = [ "oozie-client.noarch" ]
-package { $packages: }
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/506adf75/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/OOZIE_SERVER/upgrade.d/50-oozie-upgrade.pp
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/OOZIE_SERVER/upgrade.d/50-oozie-upgrade.pp b/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/OOZIE_SERVER/upgrade.d/50-oozie-upgrade.pp
deleted file mode 100644
index d80e495..0000000
--- a/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/OOZIE_SERVER/upgrade.d/50-oozie-upgrade.pp
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-#
-# 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.
-#
-#
-Package { ensure => "latest" }
-$packages = [ "oozie.noarch" ]
-package { $packages: }
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/506adf75/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/PIG/upgrade.d/50-pig-upgrade.pp
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/PIG/upgrade.d/50-pig-upgrade.pp b/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/PIG/upgrade.d/50-pig-upgrade.pp
deleted file mode 100644
index 62683db..0000000
--- a/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/PIG/upgrade.d/50-pig-upgrade.pp
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-#
-# 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.
-#
-#
-Package { ensure => "latest" }
-$packages = [ "pig.noarch" ]
-package { $packages: }
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/506adf75/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/SECONDARY_NAMENODE/upgrade.d/50-hadoop-upgrade.pp
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/SECONDARY_NAMENODE/upgrade.d/50-hadoop-upgrade.pp b/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/SECONDARY_NAMENODE/upgrade.d/50-hadoop-upgrade.pp
deleted file mode 100644
index fe37211..0000000
--- a/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/SECONDARY_NAMENODE/upgrade.d/50-hadoop-upgrade.pp
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-#
-# 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.
-#
-#
-Package { ensure => "latest" }
-$packages = [ "hadoop", "hadoop-libhdfs", "hadoop-native", "hadoop-pipes", "hadoop-sbin", "hadoop-lzo", "hadoop-lzo-native" ]
-package { $packages: }
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/506adf75/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/SQOOP/upgrade.d/50-sqoop-upgrade.pp
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/SQOOP/upgrade.d/50-sqoop-upgrade.pp b/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/SQOOP/upgrade.d/50-sqoop-upgrade.pp
deleted file mode 100644
index 44cd020..0000000
--- a/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/SQOOP/upgrade.d/50-sqoop-upgrade.pp
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-#
-# 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.
-#
-#
-Package { ensure => "latest" }
-$packages = [ "sqoop" ]
-package { $packages: }
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/506adf75/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/TASKTRACKER/upgrade.d/50-hadoop-upgrade.pp
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/TASKTRACKER/upgrade.d/50-hadoop-upgrade.pp b/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/TASKTRACKER/upgrade.d/50-hadoop-upgrade.pp
deleted file mode 100644
index fe37211..0000000
--- a/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/TASKTRACKER/upgrade.d/50-hadoop-upgrade.pp
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-#
-# 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.
-#
-#
-Package { ensure => "latest" }
-$packages = [ "hadoop", "hadoop-libhdfs", "hadoop-native", "hadoop-pipes", "hadoop-sbin", "hadoop-lzo", "hadoop-lzo-native" ]
-package { $packages: }
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/506adf75/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/WEBHCAT_SERVER/upgrade.d/50-webhcat-upgrade.pp
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/WEBHCAT_SERVER/upgrade.d/50-webhcat-upgrade.pp b/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/WEBHCAT_SERVER/upgrade.d/50-webhcat-upgrade.pp
deleted file mode 100644
index 729f699..0000000
--- a/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/WEBHCAT_SERVER/upgrade.d/50-webhcat-upgrade.pp
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-#
-# 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.
-#
-#
-Package { ensure => "latest" }
-$packages = [ "hcatalog" ]
-package { $packages: }
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/506adf75/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/ZOOKEEPER_CLIENT/upgrade.d/50-zookeeper-upgrade.pp
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/ZOOKEEPER_CLIENT/upgrade.d/50-zookeeper-upgrade.pp b/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/ZOOKEEPER_CLIENT/upgrade.d/50-zookeeper-upgrade.pp
deleted file mode 100644
index 07e975e..0000000
--- a/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/ZOOKEEPER_CLIENT/upgrade.d/50-zookeeper-upgrade.pp
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-#
-# 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.
-#
-#
-Package { ensure => "latest" }
-$packages = [ "zookeeper" ]
-package { $packages: }
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/506adf75/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/ZOOKEEPER_SERVER/upgrade.d/50-zookeeper-upgrade.pp
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/ZOOKEEPER_SERVER/upgrade.d/50-zookeeper-upgrade.pp b/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/ZOOKEEPER_SERVER/upgrade.d/50-zookeeper-upgrade.pp
deleted file mode 100644
index 07e975e..0000000
--- a/ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/ZOOKEEPER_SERVER/upgrade.d/50-zookeeper-upgrade.pp
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-#
-# 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.
-#
-#
-Package { ensure => "latest" }
-$packages = [ "zookeeper" ]
-package { $packages: }
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/506adf75/ambari-agent/src/test/python/TestHardware.py
----------------------------------------------------------------------
diff --git a/ambari-agent/src/test/python/TestHardware.py b/ambari-agent/src/test/python/TestHardware.py
index 6d182ef..18b10d6 100644
--- a/ambari-agent/src/test/python/TestHardware.py
+++ b/ambari-agent/src/test/python/TestHardware.py
@@ -19,6 +19,7 @@ limitations under the License.
'''
import subprocess, os
+import tempfile
from unittest import TestCase
from ambari_agent.Hardware import Hardware
from mock.mock import MagicMock, patch, ANY
@@ -56,13 +57,14 @@ class TestHardware(TestCase):
@patch("os.path.exists")
def test_facterInfo(self, os_path_exists_mock, hardware_facterLib_mock, subprocess_popen_mock):
config = AmbariConfig().getConfig()
- config.set("puppet", "facter_home", AmbariConfig().getConfig().get("stack", "installprefix"))
+ tmp_dir = tempfile.gettempdir()
+ config.set("puppet", "facter_home", tmp_dir)
hardware = Hardware(config)
facter = MagicMock()
facter.communicate.return_value = ["memoryfree => 1 GB\n memorysize => 25 MB\n memorytotal => 300 KB\n "
+ "physicalprocessorcount => 25\n is_virtual => true\n", "no errors"]
facter.returncode = 0
- os.environ['RUBYLIB'] = AmbariConfig().getConfig().get("stack", "installprefix");
+ os.environ['RUBYLIB'] = tmp_dir;
subprocess_popen_mock.return_value = facter
os_path_exists_mock.return_value = True
hardware_facterLib_mock.return_value = "bla bla bla"
@@ -74,7 +76,7 @@ class TestHardware(TestCase):
self.assertEquals(facterInfo['physicalprocessorcount'], 25)
self.assertTrue(facterInfo['is_virtual'])
self.assertEquals(subprocess_popen_mock.call_args[1]['env']['RUBYLIB'],
- AmbariConfig().getConfig().get("stack", "installprefix") + ":" + "bla bla bla")
+ tmp_dir + ":" + "bla bla bla")
facter.communicate.return_value = ["memoryfree => 1 G\n memorysize => 25 M\n memorytotal => 300 K\n "
+ "someinfo => 12 Byte\n ssh_name_key => Aa06Fdd\n", "no errors"]
@@ -117,13 +119,14 @@ class TestHardware(TestCase):
@patch.object(Hardware, "facterInfo")
def test_configureEnviron(self, hrdware_facterinfo_mock, subproc_popen, os_path_exists_mock):
config = AmbariConfig().getConfig()
- config.set("puppet", "ruby_home", AmbariConfig().getConfig().get("stack", "installprefix"))
+ tmpdir = tempfile.gettempdir()
+ config.set("puppet", "ruby_home", tmpdir)
hardware = Hardware(config)
os_path_exists_mock.return_value = True
result = hardware.configureEnviron({'PATH': ""})
- self.assertEquals(result['PATH'], AmbariConfig().getConfig().get("stack", "installprefix") + "/bin:")
- self.assertEquals(result['MY_RUBY_HOME'], AmbariConfig().getConfig().get("stack", "installprefix"))
+ self.assertEquals(result['PATH'], tmpdir + "/bin:")
+ self.assertEquals(result['MY_RUBY_HOME'], tmpdir)
config.remove_option("puppet", "ruby_home")
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/506adf75/ambari-agent/src/test/python/TestMain.py
----------------------------------------------------------------------
diff --git a/ambari-agent/src/test/python/TestMain.py b/ambari-agent/src/test/python/TestMain.py
index 4c17bf1..0313b9c 100644
--- a/ambari-agent/src/test/python/TestMain.py
+++ b/ambari-agent/src/test/python/TestMain.py
@@ -230,7 +230,6 @@ class TestMain(unittest.TestCase):
@patch.object(main, "resolve_ambari_config")
@patch.object(main, "perform_prestart_checks")
@patch.object(main, "daemonize")
- @patch.object(main, "killstaleprocesses")
@patch.object(main, "update_log_level")
@patch.object(NetUtil.NetUtil, "try_to_connect")
@patch.object(Controller, "__init__")
@@ -243,7 +242,7 @@ class TestMain(unittest.TestCase):
@patch.object(PingPortListener,"__init__")
def test_main(self, ping_port_init_mock, ping_port_start_mock, data_clean_init_mock,data_clean_start_mock,
parse_args_mock, join_mock, start_mock, Controller_init_mock, try_to_connect_mock,
- update_log_level_mock, killstaleprocesses_mock, daemonize_mock, perform_prestart_checks_mock,
+ update_log_level_mock, daemonize_mock, perform_prestart_checks_mock,
resolve_ambari_config_mock, stop_mock, bind_signal_handlers_mock, setup_logging_mock):
data_clean_init_mock.return_value = None
Controller_init_mock.return_value = None
@@ -260,7 +259,6 @@ class TestMain(unittest.TestCase):
self.assertTrue(resolve_ambari_config_mock.called)
self.assertTrue(perform_prestart_checks_mock.called)
self.assertTrue(daemonize_mock.called)
- self.assertTrue(killstaleprocesses_mock.called)
self.assertTrue(update_log_level_mock.called)
try_to_connect_mock.assert_called_once_with(ANY, -1, ANY)
self.assertTrue(start_mock.called)
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/506adf75/ambari-agent/src/test/python/TestPuppetExecutor.py
----------------------------------------------------------------------
diff --git a/ambari-agent/src/test/python/TestPuppetExecutor.py b/ambari-agent/src/test/python/TestPuppetExecutor.py
index a9b392a..25bd3a8 100644
--- a/ambari-agent/src/test/python/TestPuppetExecutor.py
+++ b/ambari-agent/src/test/python/TestPuppetExecutor.py
@@ -60,7 +60,7 @@ class TestPuppetExecutor(TestCase):
@patch.object(PuppetExecutor, 'isJavaAvailable')
@patch.object(PuppetExecutor, 'runPuppetFile')
def test_run_command(self, runPuppetFileMock, isJavaAvailableMock):
- tmpdir = AmbariConfig().getConfig().get("stack", "installprefix")
+ tmpdir = tempfile.gettempdir()
puppetInstance = PuppetExecutor("/tmp", "/x", "/y", tmpdir, AmbariConfig().getConfig())
jsonFile = open('../../main/python/ambari_agent/test.json', 'r')
jsonStr = jsonFile.read()
@@ -109,7 +109,7 @@ class TestPuppetExecutor(TestCase):
@patch.object(RepoInstaller, 'generate_repo_manifests')
@patch.object(PuppetExecutor, 'runPuppetFile')
def test_overwrite_repos(self, runPuppetFileMock, generateRepoManifestMock, isJavaAvailableMock):
- tmpdir = AmbariConfig().getConfig().get("stack", "installprefix")
+ tmpdir = tempfile.gettempdir()
puppetInstance = PuppetExecutor("/tmp", "/x", "/y", tmpdir, AmbariConfig().getConfig())
jsonFile = open('../../main/python/ambari_agent/test.json', 'r')
jsonStr = jsonFile.read()
@@ -146,7 +146,7 @@ class TestPuppetExecutor(TestCase):
@patch("os.path.exists")
def test_configure_environ(self, osPathExistsMock):
config = AmbariConfig().getConfig()
- tmpdir = config.get("stack", "installprefix")
+ tmpdir = tempfile.gettempdir()
puppetInstance = PuppetExecutor("/tmp", "/x", "/y", tmpdir, config)
environ = puppetInstance.configureEnviron({})
self.assertEquals(environ, {})
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/506adf75/ambari-agent/src/test/python/TestShell.py
----------------------------------------------------------------------
diff --git a/ambari-agent/src/test/python/TestShell.py b/ambari-agent/src/test/python/TestShell.py
index 8c5311a..895630e 100644
--- a/ambari-agent/src/test/python/TestShell.py
+++ b/ambari-agent/src/test/python/TestShell.py
@@ -31,16 +31,6 @@ import subprocess, time
class TestShell(unittest.TestCase):
- @patch("os.killpg")
- @patch("time.sleep")
- def test_kill_stale_process(self, timeSleepMock, os_killPgMock):
- temp_path = AmbariConfig().getConfig().get("stack", "installprefix") + '/9999.pid'
- file = open(temp_path, 'w')
- file.close()
-
- shell.killstaleprocesses()
- self.assertFalse(os.path.exists(temp_path))
-
@patch("os.setuid")
def test_changeUid(self, os_setUIDMock):
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/506adf75/ambari-agent/src/test/python/examples/ControllerTester.py
----------------------------------------------------------------------
diff --git a/ambari-agent/src/test/python/examples/ControllerTester.py b/ambari-agent/src/test/python/examples/ControllerTester.py
index 64295b5..99c94bd 100644
--- a/ambari-agent/src/test/python/examples/ControllerTester.py
+++ b/ambari-agent/src/test/python/examples/ControllerTester.py
@@ -145,10 +145,6 @@ def run_simulation():
config = AmbariConfig().getConfig()
config.set('agent', 'prefix', tmpfile)
- scriptsDir = os.path.join(os.getcwd(), os.pardir,os.pardir,
- os.pardir, 'main', 'upgrade_stack')
- config.set('stack', 'upgradeScriptsDir', scriptsDir)
-
ver_file = os.path.join(tmpfile, "version")
with open(ver_file, "w") as text_file: