You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ao...@apache.org on 2015/07/01 11:17:19 UTC

[2/2] ambari git commit: AMBARI-12230. During HDP 2.1 to 2.2.6 upgrade dfs.journalnode.edits.dir is incorrectly changed (aonishuk)

AMBARI-12230. During HDP 2.1 to 2.2.6 upgrade dfs.journalnode.edits.dir is incorrectly changed (aonishuk)


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

Branch: refs/heads/branch-2.1
Commit: e60d672f4ca32dafe879893970eca87e2e3af5d4
Parents: 4668ab8
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Wed Jul 1 12:17:14 2015 +0300
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Wed Jul 1 12:17:14 2015 +0300

----------------------------------------------------------------------
 .../main/resources/upgrade/catalog/UpgradeCatalog_1.3_to_2.2.json   | 1 -
 .../main/resources/upgrade/catalog/UpgradeCatalog_2.0_to_2.2.4.json | 1 -
 .../main/resources/upgrade/catalog/UpgradeCatalog_2.1_to_2.2.2.json | 1 -
 .../main/resources/upgrade/catalog/UpgradeCatalog_2.1_to_2.2.4.json | 1 -
 4 files changed, 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/e60d672f/ambari-server/src/main/resources/upgrade/catalog/UpgradeCatalog_1.3_to_2.2.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/upgrade/catalog/UpgradeCatalog_1.3_to_2.2.json b/ambari-server/src/main/resources/upgrade/catalog/UpgradeCatalog_1.3_to_2.2.json
index b95435c..d5087c3 100644
--- a/ambari-server/src/main/resources/upgrade/catalog/UpgradeCatalog_1.3_to_2.2.json
+++ b/ambari-server/src/main/resources/upgrade/catalog/UpgradeCatalog_1.3_to_2.2.json
@@ -481,7 +481,6 @@
           "dfs.namenode.checkpoint.txns": "1000000",
           "dfs.namenode.checkpoint.period": "21600",
           "dfs.namenode.checkpoint.edits.dir": "${dfs.namenode.checkpoint.dir}",
-          "dfs.journalnode.edits.dir": "/hadoop/hdfs/journalnode",
           "dfs.namenode.startup.delay.block.deletion.sec": "3600",
           "dfs.http.policy": "HTTP_ONLY",
           "dfs.namenode.name.dir.restore": "true",

http://git-wip-us.apache.org/repos/asf/ambari/blob/e60d672f/ambari-server/src/main/resources/upgrade/catalog/UpgradeCatalog_2.0_to_2.2.4.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/upgrade/catalog/UpgradeCatalog_2.0_to_2.2.4.json b/ambari-server/src/main/resources/upgrade/catalog/UpgradeCatalog_2.0_to_2.2.4.json
index 81a7aa6..89c732a 100755
--- a/ambari-server/src/main/resources/upgrade/catalog/UpgradeCatalog_2.0_to_2.2.4.json
+++ b/ambari-server/src/main/resources/upgrade/catalog/UpgradeCatalog_2.0_to_2.2.4.json
@@ -112,7 +112,6 @@
                 },
                 "hdfs-site": {
                     "dfs.datanode.max.transfer.threads": "16384",
-                    "dfs.journalnode.edits.dir": "/hadoop/hdfs/journalnode",
                     "dfs.namenode.handler.count": "100",
                     "dfs.namenode.startup.delay.block.deletion.sec": "3600"
                 },

http://git-wip-us.apache.org/repos/asf/ambari/blob/e60d672f/ambari-server/src/main/resources/upgrade/catalog/UpgradeCatalog_2.1_to_2.2.2.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/upgrade/catalog/UpgradeCatalog_2.1_to_2.2.2.json b/ambari-server/src/main/resources/upgrade/catalog/UpgradeCatalog_2.1_to_2.2.2.json
index 183a82c..017fb73 100644
--- a/ambari-server/src/main/resources/upgrade/catalog/UpgradeCatalog_2.1_to_2.2.2.json
+++ b/ambari-server/src/main/resources/upgrade/catalog/UpgradeCatalog_2.1_to_2.2.2.json
@@ -111,7 +111,6 @@
 		},
 		"hdfs-site": {
 		  "dfs.datanode.max.transfer.threads": "16384",
-          "dfs.journalnode.edits.dir": "/hadoop/hdfs/journalnode",
           "dfs.namenode.startup.delay.block.deletion.sec": "3600"  
 		},
 		"hive-env": {

http://git-wip-us.apache.org/repos/asf/ambari/blob/e60d672f/ambari-server/src/main/resources/upgrade/catalog/UpgradeCatalog_2.1_to_2.2.4.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/upgrade/catalog/UpgradeCatalog_2.1_to_2.2.4.json b/ambari-server/src/main/resources/upgrade/catalog/UpgradeCatalog_2.1_to_2.2.4.json
index 452f6fc..17f9030 100644
--- a/ambari-server/src/main/resources/upgrade/catalog/UpgradeCatalog_2.1_to_2.2.4.json
+++ b/ambari-server/src/main/resources/upgrade/catalog/UpgradeCatalog_2.1_to_2.2.4.json
@@ -126,7 +126,6 @@
 		},
 		"hdfs-site": {
 		  "dfs.datanode.max.transfer.threads": "16384",
-		  "dfs.journalnode.edits.dir": "/hadoop/hdfs/journalnode",
 		  "dfs.namenode.handler.count": "100",
 		  "dfs.namenode.startup.delay.block.deletion.sec": "3600"
 		},