SLIDER-38 do some minor cleanup of slider code while putting slides together
git-svn-id: https://svn.apache.org/repos/asf/incubator/slider/trunk@1593301 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/slider-core/src/main/java/org/apache/slider/common/tools/SliderUtils.java b/slider-core/src/main/java/org/apache/slider/common/tools/SliderUtils.java
index 3785484..3ff6b62 100644
--- a/slider-core/src/main/java/org/apache/slider/common/tools/SliderUtils.java
+++ b/slider-core/src/main/java/org/apache/slider/common/tools/SliderUtils.java
@@ -816,7 +816,7 @@
public static Map<String, String> buildEnvMap(Map<String, String> roleOpts) {
Map<String, String> env = new HashMap<String, String>();
if (roleOpts != null) {
- for (Map.Entry<String, String> entry:roleOpts.entrySet()) {
+ for (Map.Entry<String, String> entry: roleOpts.entrySet()) {
String key = entry.getKey();
if (key.startsWith(RoleKeys.ENV_PREFIX)) {
String envName = key.substring(RoleKeys.ENV_PREFIX.length());
diff --git a/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java b/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java
index 8c0753c..1506568 100644
--- a/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java
+++ b/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java
@@ -156,7 +156,7 @@
String logDir = ApplicationConstants.Environment.LOG_DIRS.$();
launcher.setEnv("AGENT_LOG_ROOT", logDir);
log.info("AGENT_LOG_ROOT set to {}", logDir);
- launcher.setEnv("HADOOP_USER_NAME", System.getenv(HADOOP_USER_NAME));
+ launcher.setEnv(HADOOP_USER_NAME, System.getenv(HADOOP_USER_NAME));
//local resources
diff --git a/slider-core/src/main/java/org/apache/slider/server/appmaster/RoleLaunchService.java b/slider-core/src/main/java/org/apache/slider/server/appmaster/RoleLaunchService.java
index b9856cb..60a17b7 100644
--- a/slider-core/src/main/java/org/apache/slider/server/appmaster/RoleLaunchService.java
+++ b/slider-core/src/main/java/org/apache/slider/server/appmaster/RoleLaunchService.java
@@ -48,6 +48,7 @@
* {@value}
*/
public static final int LAUNCHER_THREAD_SHUTDOWN_TIME = 10000;
+ public static final String ROLE_LAUNCH_SERVICE = "RoleLaunchService";
/**
* Map of launched threads.
* These are retained so that at shutdown time the AM can signal
@@ -89,7 +90,8 @@
* Thread group for the launchers; gives them all a useful name
* in stack dumps
*/
- private final ThreadGroup launcherThreadGroup = new ThreadGroup("launcher");
+ private final ThreadGroup launcherThreadGroup = new ThreadGroup(
+ ROLE_LAUNCH_SERVICE);
private Map<String, String> envVars;
@@ -107,7 +109,7 @@
SliderFileSystem fs,
Path generatedConfDirPath,
Map<String, String> envVars, Path launcherTmpDirPath) {
- super("RoleLaunchService");
+ super(ROLE_LAUNCH_SERVICE);
containerStarter = startOperation;
this.fs = fs;
this.generatedConfDirPath = generatedConfDirPath;
diff --git a/slider-providers/hbase/slider-hbase-provider/src/main/java/org/apache/slider/providers/hbase/HBaseKeys.java b/slider-providers/hbase/slider-hbase-provider/src/main/java/org/apache/slider/providers/hbase/HBaseKeys.java
index ed3cde3..fc7305a 100644
--- a/slider-providers/hbase/slider-hbase-provider/src/main/java/org/apache/slider/providers/hbase/HBaseKeys.java
+++ b/slider-providers/hbase/slider-hbase-provider/src/main/java/org/apache/slider/providers/hbase/HBaseKeys.java
@@ -66,6 +66,9 @@
String PROVIDER_HBASE = "hbase";
String HBASE_LOG_DIR = "HBASE_LOG_DIR";
+ String HBASE_HEAPSIZE = "HBASE_HEAPSIZE";
+ String HBASE_GC_OPTS = "SERVER_GC_OPTS";
+
}
diff --git a/slider-providers/hbase/slider-hbase-provider/src/main/java/org/apache/slider/providers/hbase/HBaseProviderService.java b/slider-providers/hbase/slider-hbase-provider/src/main/java/org/apache/slider/providers/hbase/HBaseProviderService.java
index 5dba25d..ccedcd4 100644
--- a/slider-providers/hbase/slider-hbase-provider/src/main/java/org/apache/slider/providers/hbase/HBaseProviderService.java
+++ b/slider-providers/hbase/slider-hbase-provider/src/main/java/org/apache/slider/providers/hbase/HBaseProviderService.java
@@ -151,12 +151,12 @@
String heap = appComponent.getOption(RoleKeys.JVM_HEAP, DEFAULT_JVM_HEAP);
if (SliderUtils.isSet(heap)) {
String adjustedHeap = SliderUtils.translateTrailingHeapUnit(heap);
- launcher.setEnv("HBASE_HEAPSIZE", adjustedHeap);
+ launcher.setEnv(HBASE_HEAPSIZE, adjustedHeap);
}
String gcOpts = appComponent.getOption(RoleKeys.GC_OPTS, DEFAULT_GC_OPTS);
if (SliderUtils.isSet(gcOpts)) {
- launcher.setEnv("SERVER_GC_OPTS", gcOpts);
+ launcher.setEnv(HBASE_GC_OPTS, gcOpts);
}
//this must stay relative if it is an image
diff --git a/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/HBaseTestUtils.groovy b/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/HBaseTestUtils.groovy
index aaed33f..590e5a1 100644
--- a/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/HBaseTestUtils.groovy
+++ b/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/HBaseTestUtils.groovy
@@ -198,7 +198,7 @@
Configuration clientConf = createHBaseConfiguration(sliderClient)
while (true) {
clustat = getHBaseClusterStatus(clientConf);
- int workerCount = ((List<ServerName>)clustat.servers).size();
+ int workerCount = clustat.servers.size();
if (workerCount >= regionServerCount) {
break;
}
diff --git a/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/failures/TestKilledAM.groovy b/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/failures/TestKilledAM.groovy
index a378eae..3dafe0c 100644
--- a/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/failures/TestKilledAM.groovy
+++ b/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/failures/TestKilledAM.groovy
@@ -48,7 +48,7 @@
@Test
public void testKilledAM() throws Throwable {
- skip("failing")
+// skip("failing")
String clustername = "test_killed_am"
int regionServerCount = 1
