[15/50] [abbrv] ambari git commit: AMBARI-21466. KNOX upgrade fails due to wrong stack root

2017-07-18 Thread jonathanhurley 
AMBARI-21466. KNOX upgrade fails due to wrong stack root


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

Branch: refs/heads/branch-feature-AMBARI-21450
Commit: a7b6d5a0fc72c3d20c50210e887b7294007b0dba
Parents: 0cb9194
Author: Attila Doroszlai 
Authored: Thu Jul 13 12:54:47 2017 +0200
Committer: Attila Doroszlai 
Committed: Thu Jul 13 12:54:47 2017 +0200

--
 .../libraries/functions/stack_tools.py | 13 +
 .../upgrades/ChangeStackReferencesAction.java  |  4 +++-
 .../KNOX/0.5.0.2.2/package/scripts/params_linux.py |  8 
 .../KNOX/0.5.0.2.2/package/scripts/upgrade.py  |  2 +-
 .../upgrades/ChangeStackReferencesActionTest.java  |  1 +
 5 files changed, 26 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/a7b6d5a0/ambari-common/src/main/python/resource_management/libraries/functions/stack_tools.py
--
diff --git 
a/ambari-common/src/main/python/resource_management/libraries/functions/stack_tools.py
 
b/ambari-common/src/main/python/resource_management/libraries/functions/stack_tools.py
index 420ae11..830598b 100644
--- 
a/ambari-common/src/main/python/resource_management/libraries/functions/stack_tools.py
+++ 
b/ambari-common/src/main/python/resource_management/libraries/functions/stack_tools.py
@@ -120,3 +120,16 @@ def get_stack_root(stack_name, stack_root_json):
 return "/usr/{0}".format(stack_name.lower())
 
   return stack_root[stack_name]
+
+
+def get_stack_name(stack_formatted):
+  """
+  Get the stack name (eg. HDP) from formatted string that may contain stack 
version (eg. HDP-2.6.1.0-123)
+  """
+  if stack_formatted is None:
+return None
+
+  if '-' not in stack_formatted:
+return stack_formatted
+
+  return stack_formatted.split('-')[0]

http://git-wip-us.apache.org/repos/asf/ambari/blob/a7b6d5a0/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/ChangeStackReferencesAction.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/ChangeStackReferencesAction.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/ChangeStackReferencesAction.java
index d75d031..03e5caf 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/ChangeStackReferencesAction.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/ChangeStackReferencesAction.java
@@ -35,6 +35,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.google.common.base.Function;
+import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 
@@ -45,6 +46,7 @@ import com.google.common.collect.Sets;
 public class ChangeStackReferencesAction extends AbstractServerAction {
 
   private static final Logger LOG = 
LoggerFactory.getLogger(ChangeStackReferencesAction.class);
+  private static final Set SKIP_PROPERTIES = 
ImmutableSet.of("cluster-env/stack_root");
   private static final Set> REPLACEMENTS = 
Maps.asMap(
 Sets.newHashSet("/usr/iop", "iop/apps", "iop.version", "IOP_VERSION"),
 new Function() {
@@ -83,7 +85,7 @@ public class ChangeStackReferencesAction extends 
AbstractServerAction {
 for (Map.Entry entry : properties.entrySet()) {
   String key = entry.getKey();
   String original = entry.getValue();
-  if (original != null) {
+  if (original != null && !SKIP_PROPERTIES.contains(configType + "/" + 
key)) {
 String replaced = original;
 for (Map.Entry replacement : REPLACEMENTS) {
   replaced = replaced.replace(replacement.getKey(), 
replacement.getValue());

http://git-wip-us.apache.org/repos/asf/ambari/blob/a7b6d5a0/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py
 
b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py
index 5a2ef19..9b0bbfc 100644
--- 
a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py
+++

[10/12] ambari git commit: AMBARI-21466. KNOX upgrade fails due to wrong stack root

2017-07-13 Thread jonathanhurley 
AMBARI-21466. KNOX upgrade fails due to wrong stack root


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

Branch: refs/heads/branch-feature-AMBARI-21348
Commit: a7b6d5a0fc72c3d20c50210e887b7294007b0dba
Parents: 0cb9194
Author: Attila Doroszlai 
Authored: Thu Jul 13 12:54:47 2017 +0200
Committer: Attila Doroszlai 
Committed: Thu Jul 13 12:54:47 2017 +0200

--
 .../libraries/functions/stack_tools.py | 13 +
 .../upgrades/ChangeStackReferencesAction.java  |  4 +++-
 .../KNOX/0.5.0.2.2/package/scripts/params_linux.py |  8 
 .../KNOX/0.5.0.2.2/package/scripts/upgrade.py  |  2 +-
 .../upgrades/ChangeStackReferencesActionTest.java  |  1 +
 5 files changed, 26 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/a7b6d5a0/ambari-common/src/main/python/resource_management/libraries/functions/stack_tools.py
--
diff --git 
a/ambari-common/src/main/python/resource_management/libraries/functions/stack_tools.py
 
b/ambari-common/src/main/python/resource_management/libraries/functions/stack_tools.py
index 420ae11..830598b 100644
--- 
a/ambari-common/src/main/python/resource_management/libraries/functions/stack_tools.py
+++ 
b/ambari-common/src/main/python/resource_management/libraries/functions/stack_tools.py
@@ -120,3 +120,16 @@ def get_stack_root(stack_name, stack_root_json):
 return "/usr/{0}".format(stack_name.lower())
 
   return stack_root[stack_name]
+
+
+def get_stack_name(stack_formatted):
+  """
+  Get the stack name (eg. HDP) from formatted string that may contain stack 
version (eg. HDP-2.6.1.0-123)
+  """
+  if stack_formatted is None:
+return None
+
+  if '-' not in stack_formatted:
+return stack_formatted
+
+  return stack_formatted.split('-')[0]

http://git-wip-us.apache.org/repos/asf/ambari/blob/a7b6d5a0/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/ChangeStackReferencesAction.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/ChangeStackReferencesAction.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/ChangeStackReferencesAction.java
index d75d031..03e5caf 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/ChangeStackReferencesAction.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/ChangeStackReferencesAction.java
@@ -35,6 +35,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.google.common.base.Function;
+import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 
@@ -45,6 +46,7 @@ import com.google.common.collect.Sets;
 public class ChangeStackReferencesAction extends AbstractServerAction {
 
   private static final Logger LOG = 
LoggerFactory.getLogger(ChangeStackReferencesAction.class);
+  private static final Set SKIP_PROPERTIES = 
ImmutableSet.of("cluster-env/stack_root");
   private static final Set> REPLACEMENTS = 
Maps.asMap(
 Sets.newHashSet("/usr/iop", "iop/apps", "iop.version", "IOP_VERSION"),
 new Function() {
@@ -83,7 +85,7 @@ public class ChangeStackReferencesAction extends 
AbstractServerAction {
 for (Map.Entry entry : properties.entrySet()) {
   String key = entry.getKey();
   String original = entry.getValue();
-  if (original != null) {
+  if (original != null && !SKIP_PROPERTIES.contains(configType + "/" + 
key)) {
 String replaced = original;
 for (Map.Entry replacement : REPLACEMENTS) {
   replaced = replaced.replace(replacement.getKey(), 
replacement.getValue());

http://git-wip-us.apache.org/repos/asf/ambari/blob/a7b6d5a0/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py
 
b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py
index 5a2ef19..9b0bbfc 100644
--- 
a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py
+++

ambari git commit: AMBARI-21466. KNOX upgrade fails due to wrong stack root

2017-07-13 Thread adoroszlai 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 0cb9194f5 -> a7b6d5a0f


AMBARI-21466. KNOX upgrade fails due to wrong stack root


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

Branch: refs/heads/branch-2.5
Commit: a7b6d5a0fc72c3d20c50210e887b7294007b0dba
Parents: 0cb9194
Author: Attila Doroszlai 
Authored: Thu Jul 13 12:54:47 2017 +0200
Committer: Attila Doroszlai 
Committed: Thu Jul 13 12:54:47 2017 +0200

--
 .../libraries/functions/stack_tools.py | 13 +
 .../upgrades/ChangeStackReferencesAction.java  |  4 +++-
 .../KNOX/0.5.0.2.2/package/scripts/params_linux.py |  8 
 .../KNOX/0.5.0.2.2/package/scripts/upgrade.py  |  2 +-
 .../upgrades/ChangeStackReferencesActionTest.java  |  1 +
 5 files changed, 26 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/a7b6d5a0/ambari-common/src/main/python/resource_management/libraries/functions/stack_tools.py
--
diff --git 
a/ambari-common/src/main/python/resource_management/libraries/functions/stack_tools.py
 
b/ambari-common/src/main/python/resource_management/libraries/functions/stack_tools.py
index 420ae11..830598b 100644
--- 
a/ambari-common/src/main/python/resource_management/libraries/functions/stack_tools.py
+++ 
b/ambari-common/src/main/python/resource_management/libraries/functions/stack_tools.py
@@ -120,3 +120,16 @@ def get_stack_root(stack_name, stack_root_json):
 return "/usr/{0}".format(stack_name.lower())
 
   return stack_root[stack_name]
+
+
+def get_stack_name(stack_formatted):
+  """
+  Get the stack name (eg. HDP) from formatted string that may contain stack 
version (eg. HDP-2.6.1.0-123)
+  """
+  if stack_formatted is None:
+return None
+
+  if '-' not in stack_formatted:
+return stack_formatted
+
+  return stack_formatted.split('-')[0]

http://git-wip-us.apache.org/repos/asf/ambari/blob/a7b6d5a0/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/ChangeStackReferencesAction.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/ChangeStackReferencesAction.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/ChangeStackReferencesAction.java
index d75d031..03e5caf 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/ChangeStackReferencesAction.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/ChangeStackReferencesAction.java
@@ -35,6 +35,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.google.common.base.Function;
+import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 
@@ -45,6 +46,7 @@ import com.google.common.collect.Sets;
 public class ChangeStackReferencesAction extends AbstractServerAction {
 
   private static final Logger LOG = 
LoggerFactory.getLogger(ChangeStackReferencesAction.class);
+  private static final Set SKIP_PROPERTIES = 
ImmutableSet.of("cluster-env/stack_root");
   private static final Set> REPLACEMENTS = 
Maps.asMap(
 Sets.newHashSet("/usr/iop", "iop/apps", "iop.version", "IOP_VERSION"),
 new Function() {
@@ -83,7 +85,7 @@ public class ChangeStackReferencesAction extends 
AbstractServerAction {
 for (Map.Entry entry : properties.entrySet()) {
   String key = entry.getKey();
   String original = entry.getValue();
-  if (original != null) {
+  if (original != null && !SKIP_PROPERTIES.contains(configType + "/" + 
key)) {
 String replaced = original;
 for (Map.Entry replacement : REPLACEMENTS) {
   replaced = replaced.replace(replacement.getKey(), 
replacement.getValue());

http://git-wip-us.apache.org/repos/asf/ambari/blob/a7b6d5a0/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py
 
b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py
index 5a2ef19..9b0bbfc 100644
--- 
a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py
+++