Ver código fonte

AMBARI-1733. Add service/component specific upgrade puppet files. (smohanty)

git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/trunk@1461954 13f79535-47bb-0310-9956-ffa450edef68
Sumit Mohanty 12 anos atrás
pai
commit
0f52f8bf2b
41 arquivos alterados com 413 adições e 363 exclusões
  1. 2 0
      CHANGES.txt
  2. 0 21
      ambari-agent/src/main/upgrade_scripts/stub
  3. 23 0
      ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/DATANODE/upgrade.d/50-hadoop-upgrade.pp
  4. 0 19
      ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/HBASE_CLIENT/stub.txt
  5. 3 2
      ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/HBASE_CLIENT/upgrade.d/50-hbase-upgrade.pp
  6. 0 19
      ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/HBASE_MASTER/stub.txt
  7. 23 0
      ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/HBASE_MASTER/upgrade.d/50-hbase-upgrade.pp
  8. 0 19
      ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/HBASE_REGIONSERVER/stub.txt
  9. 23 0
      ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/HBASE_REGIONSERVER/upgrade.d/50-hbase-upgrade.pp
  10. 0 19
      ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/HCAT/stub.txt
  11. 23 0
      ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/HCAT/upgrade.d/50-hcat-upgrade.pp
  12. 23 0
      ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/HDFS_CLIENT/upgrade.d/50-hadoop-upgrade.pp
  13. 0 19
      ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/HIVE_CLIENT/stub.txt
  14. 3 2
      ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/HIVE_CLIENT/upgrade.d/50-hive-upgrade.pp
  15. 0 19
      ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/HIVE_METASTORE/stub.txt
  16. 3 2
      ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/HIVE_METASTORE/upgrade.d/50-hive-upgrade.pp
  17. 0 19
      ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/HIVE_SERVER/stub.txt
  18. 3 2
      ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/HIVE_SERVER/upgrade.d/50-hive-upgrade.pp
  19. 23 0
      ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/JOBTRACKER/upgrade.d/50-hadoop-upgrade.pp
  20. 23 0
      ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/MAPREDUCE_CLIENT/upgrade.d/50-hadoop-upgrade.pp
  21. 0 22
      ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/NAMENODE/upgrade.d/50-dummy.pp
  22. 23 0
      ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/NAMENODE/upgrade.d/50-hadoop-upgrade.pp
  23. 0 19
      ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/OOZIE_CLIENT/stub.txt
  24. 23 0
      ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/OOZIE_CLIENT/upgrade.d/50-oozie-client-upgrade.pp
  25. 0 19
      ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/OOZIE_SERVER/stub.txt
  26. 23 0
      ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/OOZIE_SERVER/upgrade.d/50-oozie-upgrade.pp
  27. 0 19
      ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/PIG/stub.txt
  28. 23 0
      ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/PIG/upgrade.d/50-pig-upgrade.pp
  29. 0 22
      ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/SECONDARY_NAMENODE/upgrade.d/50-dummy.pp
  30. 23 0
      ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/SECONDARY_NAMENODE/upgrade.d/50-hadoop-upgrade.pp
  31. 0 19
      ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/SQOOP/stub.txt
  32. 23 0
      ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/SQOOP/upgrade.d/50-sqoop-upgrade.pp
  33. 0 22
      ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/TASKTRACKER/upgrade.d/50-dummy.pp
  34. 23 0
      ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/TASKTRACKER/upgrade.d/50-hadoop-upgrade.pp
  35. 0 19
      ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/WEBHCAT_SERVER/stub.txt
  36. 23 0
      ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/WEBHCAT_SERVER/upgrade.d/50-webhcat-upgrade.pp
  37. 0 19
      ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/ZOOKEEPER_CLIENT/stub.txt
  38. 23 0
      ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/ZOOKEEPER_CLIENT/upgrade.d/50-zookeeper-upgrade.pp
  39. 0 19
      ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/ZOOKEEPER_SERVER/stub.txt
  40. 23 0
      ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/ZOOKEEPER_SERVER/upgrade.d/50-zookeeper-upgrade.pp
  41. 8 2
      ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionScheduler.java

+ 2 - 0
CHANGES.txt

@@ -532,6 +532,8 @@ Trunk (unreleased changes):
 
  BUG FIXES
 
+ AMBARI 1733. Add service/component specific upgrade puppet files. (smohanty)
+
  AMBARI-1731. WebHcat smoke test fails for the secure cluster. (jaimin)
 
  AMBARI-1730. Hive Service check fails in non secure cluster. (jaimin)

+ 0 - 21
ambari-agent/src/main/upgrade_scripts/stub

@@ -1,21 +0,0 @@
-#!/usr/bin/env python2.6
-
-'''
-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.
-'''
-
-#Will be replaced with a real folder

+ 23 - 0
ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/DATANODE/upgrade.d/50-hadoop-upgrade.pp

@@ -0,0 +1,23 @@
+#
+#
+# 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: }

+ 0 - 19
ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/HBASE_CLIENT/stub.txt

@@ -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.

+ 3 - 2
ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/MAPREDUCE_CLIENT/upgrade.d/50-dummy.pp → ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/HBASE_CLIENT/upgrade.d/50-hbase-upgrade.pp

@@ -18,5 +18,6 @@
 # under the License.
 #
 #
-
-notify {"Dummy notification":}
+Package { ensure => "latest" }
+$packages = [ "hbase" ]
+package { $packages: }

+ 0 - 19
ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/HBASE_MASTER/stub.txt

@@ -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.

+ 23 - 0
ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/HBASE_MASTER/upgrade.d/50-hbase-upgrade.pp

@@ -0,0 +1,23 @@
+#
+#
+# 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: }

+ 0 - 19
ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/HBASE_REGIONSERVER/stub.txt

@@ -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.

+ 23 - 0
ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/HBASE_REGIONSERVER/upgrade.d/50-hbase-upgrade.pp

@@ -0,0 +1,23 @@
+#
+#
+# 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: }

+ 0 - 19
ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/HCAT/stub.txt

@@ -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.

+ 23 - 0
ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/HCAT/upgrade.d/50-hcat-upgrade.pp

@@ -0,0 +1,23 @@
+#
+#
+# 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: }

+ 23 - 0
ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/HDFS_CLIENT/upgrade.d/50-hadoop-upgrade.pp

@@ -0,0 +1,23 @@
+#
+#
+# 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: }

+ 0 - 19
ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/HIVE_CLIENT/stub.txt

@@ -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.

+ 3 - 2
ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/HDFS_CLIENT/upgrade.d/50-dummy.pp → ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/HIVE_CLIENT/upgrade.d/50-hive-upgrade.pp

@@ -18,5 +18,6 @@
 # under the License.
 #
 #
-
-notify {"Dummy notification":}
+Package { ensure => "latest" }
+$packages = [ "hive" ]
+package { $packages: }

+ 0 - 19
ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/HIVE_METASTORE/stub.txt

@@ -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.

+ 3 - 2
ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/DATANODE/upgrade.d/50-dummy.pp → ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/HIVE_METASTORE/upgrade.d/50-hive-upgrade.pp

@@ -18,5 +18,6 @@
 # under the License.
 #
 #
-
-notify {"Dummy notification":}
+Package { ensure => "latest" }
+$packages = [ "hive" ]
+package { $packages: }

+ 0 - 19
ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/HIVE_SERVER/stub.txt

@@ -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.

+ 3 - 2
ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/JOBTRACKER/upgrade.d/50-dummy.pp → ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/HIVE_SERVER/upgrade.d/50-hive-upgrade.pp

@@ -18,5 +18,6 @@
 # under the License.
 #
 #
-
-notify {"Dummy notification":}
+Package { ensure => "latest" }
+$packages = [ "hive" ]
+package { $packages: }

+ 23 - 0
ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/JOBTRACKER/upgrade.d/50-hadoop-upgrade.pp

@@ -0,0 +1,23 @@
+#
+#
+# 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: }

+ 23 - 0
ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/MAPREDUCE_CLIENT/upgrade.d/50-hadoop-upgrade.pp

@@ -0,0 +1,23 @@
+#
+#
+# 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: }

+ 0 - 22
ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/NAMENODE/upgrade.d/50-dummy.pp

@@ -1,22 +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.
-#
-#
-
-notify {"Dummy notification":}

+ 23 - 0
ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/NAMENODE/upgrade.d/50-hadoop-upgrade.pp

@@ -0,0 +1,23 @@
+#
+#
+# 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: }

+ 0 - 19
ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/OOZIE_CLIENT/stub.txt

@@ -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.

+ 23 - 0
ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/OOZIE_CLIENT/upgrade.d/50-oozie-client-upgrade.pp

@@ -0,0 +1,23 @@
+#
+#
+# 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: }

+ 0 - 19
ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/OOZIE_SERVER/stub.txt

@@ -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.

+ 23 - 0
ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/OOZIE_SERVER/upgrade.d/50-oozie-upgrade.pp

@@ -0,0 +1,23 @@
+#
+#
+# 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: }

+ 0 - 19
ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/PIG/stub.txt

@@ -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.

+ 23 - 0
ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/PIG/upgrade.d/50-pig-upgrade.pp

@@ -0,0 +1,23 @@
+#
+#
+# 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: }

+ 0 - 22
ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/SECONDARY_NAMENODE/upgrade.d/50-dummy.pp

@@ -1,22 +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.
-#
-#
-
-notify {"Dummy notification":}

+ 23 - 0
ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/SECONDARY_NAMENODE/upgrade.d/50-hadoop-upgrade.pp

@@ -0,0 +1,23 @@
+#
+#
+# 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: }

+ 0 - 19
ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/SQOOP/stub.txt

@@ -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.

+ 23 - 0
ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/SQOOP/upgrade.d/50-sqoop-upgrade.pp

@@ -0,0 +1,23 @@
+#
+#
+# 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: }

+ 0 - 22
ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/TASKTRACKER/upgrade.d/50-dummy.pp

@@ -1,22 +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.
-#
-#
-
-notify {"Dummy notification":}

+ 23 - 0
ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/TASKTRACKER/upgrade.d/50-hadoop-upgrade.pp

@@ -0,0 +1,23 @@
+#
+#
+# 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: }

+ 0 - 19
ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/WEBHCAT_SERVER/stub.txt

@@ -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.

+ 23 - 0
ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/WEBHCAT_SERVER/upgrade.d/50-webhcat-upgrade.pp

@@ -0,0 +1,23 @@
+#
+#
+# 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: }

+ 0 - 19
ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/ZOOKEEPER_CLIENT/stub.txt

@@ -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.

+ 23 - 0
ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/ZOOKEEPER_CLIENT/upgrade.d/50-zookeeper-upgrade.pp

@@ -0,0 +1,23 @@
+#
+#
+# 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: }

+ 0 - 19
ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/ZOOKEEPER_SERVER/stub.txt

@@ -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.

+ 23 - 0
ambari-agent/src/main/upgrade_stack/HDP-1.2_HDP-1.3/ZOOKEEPER_SERVER/upgrade.d/50-zookeeper-upgrade.pp

@@ -0,0 +1,23 @@
+#
+#
+# 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: }

+ 8 - 2
ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionScheduler.java

@@ -165,8 +165,14 @@ class ActionScheduler implements Runnable {
         if (cmd.getRole() == Role.AMBARI_SERVER_ACTION) {
           try {
             long now = System.currentTimeMillis();
-            s.setStartTime(cmd.getHostname(), cmd.getRole().toString(), now);
-            s.setLastAttemptTime(cmd.getHostname(), cmd.getRole().toString(), now);
+            String hostName = cmd.getHostname();
+            String roleName = cmd.getRole().toString();
+
+            s.setStartTime(hostName, roleName, now);
+            s.setLastAttemptTime(hostName, roleName, now);
+            s.incrementAttemptCount(hostName, roleName);
+            s.setHostRoleStatus(hostName, roleName, HostRoleStatus.QUEUED);
+            db.hostRoleScheduled(s, hostName, roleName);
             String actionName = cmd.getRoleParams().get(ServerAction.ACTION_NAME);
             this.serverActionManager.executeAction(actionName, cmd.getCommandParams());
             reportServerActionSuccess(s, cmd);