You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by dm...@apache.org on 2015/10/21 19:21:26 UTC
[1/2] ambari git commit: AMBARI-13335. Install package command during
RU should honor excluded packages - temporary workaround (dlysnichenko)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 10c54a566 -> a0a005b2a
refs/heads/trunk d259917d7 -> 85bd7cdbc
AMBARI-13335. Install package command during RU should honor excluded packages - temporary workaround (dlysnichenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/85bd7cdb
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/85bd7cdb
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/85bd7cdb
Branch: refs/heads/trunk
Commit: 85bd7cdbc01da56b9d16abd29f18153cefcdead6
Parents: d259917
Author: Lisnichenko Dmitro <dl...@hortonworks.com>
Authored: Wed Oct 7 14:44:14 2015 +0300
Committer: Lisnichenko Dmitro <dl...@hortonworks.com>
Committed: Wed Oct 21 20:12:35 2015 +0300
----------------------------------------------------------------------
ambari-server/conf/unix/ambari.properties | 1 +
.../server/configuration/Configuration.java | 20 ++++++++++++++++++++
.../ClusterStackVersionResourceProvider.java | 13 +++++++++++--
.../HostStackVersionResourceProvider.java | 13 +++++++++++--
4 files changed, 43 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/85bd7cdb/ambari-server/conf/unix/ambari.properties
----------------------------------------------------------------------
diff --git a/ambari-server/conf/unix/ambari.properties b/ambari-server/conf/unix/ambari.properties
index 53af453..58f09d1 100644
--- a/ambari-server/conf/unix/ambari.properties
+++ b/ambari-server/conf/unix/ambari.properties
@@ -96,6 +96,7 @@ skip.service.checks=false
rolling.upgrade.min.stack=HDP-2.2
rolling.upgrade.max.stack=
+rolling.upgrade.skip.packages.prefixes=
# HTTP Header settings for Ambari Server UI
http.strict-transport-security=max-age=31536000
http://git-wip-us.apache.org/repos/asf/ambari/blob/85bd7cdb/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java b/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
index 702e12d..04ab1ef 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
@@ -21,8 +21,10 @@ import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
+import java.util.ArrayList;
import java.util.EnumSet;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Properties;
@@ -179,8 +181,10 @@ public class Configuration {
public static final String SERVER_JDBC_PROPERTIES_PREFIX = "server.jdbc.properties.";
public static final String ROLLING_UPGRADE_MIN_STACK_KEY = "rolling.upgrade.min.stack";
public static final String ROLLING_UPGRADE_MAX_STACK_KEY = "rolling.upgrade.max.stack";
+ public static final String ROLLING_UPGRADE_SKIP_PACKAGES_PREFIXES_KEY = "rolling.upgrade.skip.packages.prefixes";
public static final String ROLLING_UPGRADE_MIN_STACK_DEFAULT = "HDP-2.2";
public static final String ROLLING_UPGRADE_MAX_STACK_DEFAULT = "";
+ public static final String ROLLING_UPGRADE_SKIP_PACKAGES_PREFIXES_DEFAULT = "";
public static final String SERVER_JDBC_CONNECTION_POOL = "server.jdbc.connection-pool";
public static final String SERVER_JDBC_CONNECTION_POOL_MIN_SIZE = "server.jdbc.connection-pool.min-size";
@@ -923,6 +927,22 @@ public class Configuration {
}
/**
+ * @return a list of prefixes. Packages whose name starts with any of these
+ * prefixes, should be skipped during upgrade.
+ */
+ public List<String> getRollingUpgradeSkipPackagesPrefixes() {
+ String propertyValue = properties.getProperty(ROLLING_UPGRADE_SKIP_PACKAGES_PREFIXES_KEY,
+ ROLLING_UPGRADE_SKIP_PACKAGES_PREFIXES_DEFAULT);
+ ArrayList<String> res = new ArrayList<>();
+ for (String prefix : propertyValue.split(",")) {
+ if (! prefix.isEmpty()) {
+ res.add(prefix.trim());
+ }
+ }
+ return res;
+ }
+
+ /**
* Get the map with server config parameters.
* Keys - public constants of this class
* @return the map with server config parameters
http://git-wip-us.apache.org/repos/asf/ambari/blob/85bd7cdb/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
index abd9f4a..2a1431d 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
@@ -474,7 +474,7 @@ public class ClusterStackVersionResourceProvider extends AbstractControllerResou
for (ServiceComponentHost component : components) {
servicesOnHost.add(component.getServiceName());
}
-
+ List<String> blacklistedPackagePrefixes = configuration.getRollingUpgradeSkipPackagesPrefixes();
for (String serviceName : servicesOnHost) {
ServiceInfo info;
try {
@@ -488,7 +488,16 @@ public class ClusterStackVersionResourceProvider extends AbstractControllerResou
host.getOsFamily());
for (ServiceOsSpecific.Package aPackage : packagesForService) {
if (! aPackage.getSkipUpgrade()) {
- packages.add(aPackage);
+ boolean blacklisted = false;
+ for(String prefix : blacklistedPackagePrefixes) {
+ if (aPackage.getName().startsWith(prefix)) {
+ blacklisted = true;
+ break;
+ }
+ }
+ if (! blacklisted) {
+ packages.add(aPackage);
+ }
}
}
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/85bd7cdb/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostStackVersionResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostStackVersionResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostStackVersionResourceProvider.java
index a09edd0..43a4423 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostStackVersionResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostStackVersionResourceProvider.java
@@ -367,7 +367,7 @@ public class HostStackVersionResourceProvider extends AbstractControllerResource
for (ServiceComponentHost component : components) {
servicesOnHost.add(component.getServiceName());
}
-
+ List<String> blacklistedPackagePrefixes = configuration.getRollingUpgradeSkipPackagesPrefixes();
for (String serviceName : servicesOnHost) {
ServiceInfo info;
try {
@@ -380,7 +380,16 @@ public class HostStackVersionResourceProvider extends AbstractControllerResource
host.getOsFamily());
for (ServiceOsSpecific.Package aPackage : packagesForService) {
if (! aPackage.getSkipUpgrade()) {
- packages.add(aPackage);
+ boolean blacklisted = false;
+ for(String prefix : blacklistedPackagePrefixes) {
+ if (aPackage.getName().startsWith(prefix)) {
+ blacklisted = true;
+ break;
+ }
+ }
+ if (! blacklisted) {
+ packages.add(aPackage);
+ }
}
}
}
[2/2] ambari git commit: AMBARI-13335. Install package command during
RU should honor excluded packages - temporary workaround (dlysnichenko)
Posted by dm...@apache.org.
AMBARI-13335. Install package command during RU should honor excluded packages - temporary workaround (dlysnichenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a0a005b2
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a0a005b2
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a0a005b2
Branch: refs/heads/branch-2.1
Commit: a0a005b2a88ed356a49671204c670097a74b3107
Parents: 10c54a5
Author: Lisnichenko Dmitro <dl...@hortonworks.com>
Authored: Wed Oct 7 14:44:14 2015 +0300
Committer: Lisnichenko Dmitro <dl...@hortonworks.com>
Committed: Wed Oct 21 20:21:17 2015 +0300
----------------------------------------------------------------------
ambari-server/conf/unix/ambari.properties | 1 +
.../server/configuration/Configuration.java | 20 ++++++++++++++++++++
.../ClusterStackVersionResourceProvider.java | 13 +++++++++++--
.../HostStackVersionResourceProvider.java | 13 +++++++++++--
4 files changed, 43 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/a0a005b2/ambari-server/conf/unix/ambari.properties
----------------------------------------------------------------------
diff --git a/ambari-server/conf/unix/ambari.properties b/ambari-server/conf/unix/ambari.properties
index 53af453..58f09d1 100644
--- a/ambari-server/conf/unix/ambari.properties
+++ b/ambari-server/conf/unix/ambari.properties
@@ -96,6 +96,7 @@ skip.service.checks=false
rolling.upgrade.min.stack=HDP-2.2
rolling.upgrade.max.stack=
+rolling.upgrade.skip.packages.prefixes=
# HTTP Header settings for Ambari Server UI
http.strict-transport-security=max-age=31536000
http://git-wip-us.apache.org/repos/asf/ambari/blob/a0a005b2/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java b/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
index 702e12d..04ab1ef 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
@@ -21,8 +21,10 @@ import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
+import java.util.ArrayList;
import java.util.EnumSet;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Properties;
@@ -179,8 +181,10 @@ public class Configuration {
public static final String SERVER_JDBC_PROPERTIES_PREFIX = "server.jdbc.properties.";
public static final String ROLLING_UPGRADE_MIN_STACK_KEY = "rolling.upgrade.min.stack";
public static final String ROLLING_UPGRADE_MAX_STACK_KEY = "rolling.upgrade.max.stack";
+ public static final String ROLLING_UPGRADE_SKIP_PACKAGES_PREFIXES_KEY = "rolling.upgrade.skip.packages.prefixes";
public static final String ROLLING_UPGRADE_MIN_STACK_DEFAULT = "HDP-2.2";
public static final String ROLLING_UPGRADE_MAX_STACK_DEFAULT = "";
+ public static final String ROLLING_UPGRADE_SKIP_PACKAGES_PREFIXES_DEFAULT = "";
public static final String SERVER_JDBC_CONNECTION_POOL = "server.jdbc.connection-pool";
public static final String SERVER_JDBC_CONNECTION_POOL_MIN_SIZE = "server.jdbc.connection-pool.min-size";
@@ -923,6 +927,22 @@ public class Configuration {
}
/**
+ * @return a list of prefixes. Packages whose name starts with any of these
+ * prefixes, should be skipped during upgrade.
+ */
+ public List<String> getRollingUpgradeSkipPackagesPrefixes() {
+ String propertyValue = properties.getProperty(ROLLING_UPGRADE_SKIP_PACKAGES_PREFIXES_KEY,
+ ROLLING_UPGRADE_SKIP_PACKAGES_PREFIXES_DEFAULT);
+ ArrayList<String> res = new ArrayList<>();
+ for (String prefix : propertyValue.split(",")) {
+ if (! prefix.isEmpty()) {
+ res.add(prefix.trim());
+ }
+ }
+ return res;
+ }
+
+ /**
* Get the map with server config parameters.
* Keys - public constants of this class
* @return the map with server config parameters
http://git-wip-us.apache.org/repos/asf/ambari/blob/a0a005b2/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
index e8a089d..9a93d24 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
@@ -462,7 +462,7 @@ public class ClusterStackVersionResourceProvider extends AbstractControllerResou
for (ServiceComponentHost component : components) {
servicesOnHost.add(component.getServiceName());
}
-
+ List<String> blacklistedPackagePrefixes = configuration.getRollingUpgradeSkipPackagesPrefixes();
for (String serviceName : servicesOnHost) {
ServiceInfo info;
try {
@@ -476,7 +476,16 @@ public class ClusterStackVersionResourceProvider extends AbstractControllerResou
host.getOsFamily());
for (ServiceOsSpecific.Package aPackage : packagesForService) {
if (! aPackage.getSkipUpgrade()) {
- packages.add(aPackage);
+ boolean blacklisted = false;
+ for(String prefix : blacklistedPackagePrefixes) {
+ if (aPackage.getName().startsWith(prefix)) {
+ blacklisted = true;
+ break;
+ }
+ }
+ if (! blacklisted) {
+ packages.add(aPackage);
+ }
}
}
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/a0a005b2/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostStackVersionResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostStackVersionResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostStackVersionResourceProvider.java
index a09edd0..43a4423 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostStackVersionResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostStackVersionResourceProvider.java
@@ -367,7 +367,7 @@ public class HostStackVersionResourceProvider extends AbstractControllerResource
for (ServiceComponentHost component : components) {
servicesOnHost.add(component.getServiceName());
}
-
+ List<String> blacklistedPackagePrefixes = configuration.getRollingUpgradeSkipPackagesPrefixes();
for (String serviceName : servicesOnHost) {
ServiceInfo info;
try {
@@ -380,7 +380,16 @@ public class HostStackVersionResourceProvider extends AbstractControllerResource
host.getOsFamily());
for (ServiceOsSpecific.Package aPackage : packagesForService) {
if (! aPackage.getSkipUpgrade()) {
- packages.add(aPackage);
+ boolean blacklisted = false;
+ for(String prefix : blacklistedPackagePrefixes) {
+ if (aPackage.getName().startsWith(prefix)) {
+ blacklisted = true;
+ break;
+ }
+ }
+ if (! blacklisted) {
+ packages.add(aPackage);
+ }
}
}
}