You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by nc...@apache.org on 2016/07/19 00:30:42 UTC
ambari git commit: AMBARI-17773. NFS_GATEWAY version reports
incorrect in DB after EU (ncole)
Repository: ambari
Updated Branches:
refs/heads/trunk e405f5277 -> 2c676de09
AMBARI-17773. NFS_GATEWAY version reports incorrect in DB after EU (ncole)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2c676de0
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2c676de0
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2c676de0
Branch: refs/heads/trunk
Commit: 2c676de097d041c48eaf5f7a2ac7e83843829158
Parents: e405f52
Author: Nate Cole <nc...@hortonworks.com>
Authored: Mon Jul 18 14:37:50 2016 -0400
Committer: Nate Cole <nc...@hortonworks.com>
Committed: Mon Jul 18 20:30:04 2016 -0400
----------------------------------------------------------------------
.../main/resources/stacks/HDP/2.3/services/HDFS/metainfo.xml | 2 +-
.../main/resources/stacks/HDP/2.3/upgrades/upgrade-2.4.xml | 7 +++++++
.../main/resources/stacks/HDP/2.3/upgrades/upgrade-2.5.xml | 7 +++++++
.../main/resources/stacks/HDP/2.4/upgrades/upgrade-2.5.xml | 7 +++++++
4 files changed, 22 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/2c676de0/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/metainfo.xml
index f19110e..d4ff7b7 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/metainfo.xml
@@ -27,7 +27,7 @@
<name>NFS_GATEWAY</name>
<displayName>NFSGateway</displayName>
<cardinality>0+</cardinality>
- <versionAdvertised>false</versionAdvertised>
+ <versionAdvertised>true</versionAdvertised>
<category>SLAVE</category>
<commandScript>
<script>scripts/nfsgateway.py</script>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2c676de0/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.4.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.4.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.4.xml
index b139d2e..27e7e92 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.4.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.4.xml
@@ -221,6 +221,7 @@
<service-check>false</service-check>
<service name="HDFS">
<component>DATANODE</component>
+ <component>NFS_GATEWAY</component>
</service>
<service name="HBASE">
@@ -572,6 +573,12 @@
<task xsi:type="restart-task" />
</upgrade>
</component>
+
+ <component name="NFS_GATEWAY">
+ <upgrade>
+ <task xsi:type="restart-task" />
+ </upgrade>
+ </component>
<component name="HDFS_CLIENT">
<upgrade>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2c676de0/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.5.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.5.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.5.xml
index 09007a6..964ec3f 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.5.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.5.xml
@@ -231,6 +231,7 @@
<service-check>false</service-check>
<service name="HDFS">
<component>DATANODE</component>
+ <component>NFS_GATEWAY</component>
</service>
<service name="HBASE">
@@ -634,6 +635,12 @@
<task xsi:type="restart-task" />
</upgrade>
</component>
+
+ <component name="NFS_GATEWAY">
+ <upgrade>
+ <task xsi:type="restart-task" />
+ </upgrade>
+ </component>
<component name="HDFS_CLIENT">
<upgrade>
http://git-wip-us.apache.org/repos/asf/ambari/blob/2c676de0/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.5.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.5.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.5.xml
index a9336bb..49ff6da 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.5.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.5.xml
@@ -226,6 +226,7 @@
<service-check>false</service-check>
<service name="HDFS">
<component>DATANODE</component>
+ <component>NFS_GATEWAY</component>
</service>
<service name="HBASE">
@@ -627,6 +628,12 @@
<task xsi:type="restart-task" />
</upgrade>
</component>
+
+ <component name="NFS_GATEWAY">
+ <upgrade>
+ <task xsi:type="restart-task" />
+ </upgrade>
+ </component>
<component name="HDFS_CLIENT">
<upgrade>