You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by st...@apache.org on 2014/05/08 16:51:39 UTC
svn commit: r1593301 - in /incubator/slider/trunk:
slider-core/src/main/java/org/apache/slider/common/tools/
slider-core/src/main/java/org/apache/slider/providers/agent/
slider-core/src/main/java/org/apache/slider/server/appmaster/
slider-providers/hba...
Author: stevel
Date: Thu May 8 14:51:39 2014
New Revision: 1593301
URL: http://svn.apache.org/r1593301
Log:
SLIDER-38 do some minor cleanup of slider code while putting slides together
Modified:
incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/common/tools/SliderUtils.java
incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java
incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/appmaster/RoleLaunchService.java
incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/main/java/org/apache/slider/providers/hbase/HBaseKeys.java
incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/main/java/org/apache/slider/providers/hbase/HBaseProviderService.java
incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/HBaseTestUtils.groovy
incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/failures/TestKilledAM.groovy
Modified: incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/common/tools/SliderUtils.java
URL: http://svn.apache.org/viewvc/incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/common/tools/SliderUtils.java?rev=1593301&r1=1593300&r2=1593301&view=diff
==============================================================================
--- incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/common/tools/SliderUtils.java (original)
+++ incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/common/tools/SliderUtils.java Thu May 8 14:51:39 2014
@@ -816,7 +816,7 @@ public final class SliderUtils {
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());
Modified: incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java
URL: http://svn.apache.org/viewvc/incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java?rev=1593301&r1=1593300&r2=1593301&view=diff
==============================================================================
--- incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java (original)
+++ incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java Thu May 8 14:51:39 2014
@@ -156,7 +156,7 @@ public class AgentProviderService extend
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
Modified: incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/appmaster/RoleLaunchService.java
URL: http://svn.apache.org/viewvc/incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/appmaster/RoleLaunchService.java?rev=1593301&r1=1593300&r2=1593301&view=diff
==============================================================================
--- incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/appmaster/RoleLaunchService.java (original)
+++ incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/appmaster/RoleLaunchService.java Thu May 8 14:51:39 2014
@@ -48,6 +48,7 @@ public class RoleLaunchService extends A
* {@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 @@ public class RoleLaunchService extends A
* 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 @@ public class RoleLaunchService extends A
SliderFileSystem fs,
Path generatedConfDirPath,
Map<String, String> envVars, Path launcherTmpDirPath) {
- super("RoleLaunchService");
+ super(ROLE_LAUNCH_SERVICE);
containerStarter = startOperation;
this.fs = fs;
this.generatedConfDirPath = generatedConfDirPath;
Modified: incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/main/java/org/apache/slider/providers/hbase/HBaseKeys.java
URL: http://svn.apache.org/viewvc/incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/main/java/org/apache/slider/providers/hbase/HBaseKeys.java?rev=1593301&r1=1593300&r2=1593301&view=diff
==============================================================================
--- incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/main/java/org/apache/slider/providers/hbase/HBaseKeys.java (original)
+++ incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/main/java/org/apache/slider/providers/hbase/HBaseKeys.java Thu May 8 14:51:39 2014
@@ -66,6 +66,9 @@ public interface HBaseKeys {
String PROVIDER_HBASE = "hbase";
String HBASE_LOG_DIR = "HBASE_LOG_DIR";
+ String HBASE_HEAPSIZE = "HBASE_HEAPSIZE";
+ String HBASE_GC_OPTS = "SERVER_GC_OPTS";
+
}
Modified: incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/main/java/org/apache/slider/providers/hbase/HBaseProviderService.java
URL: http://svn.apache.org/viewvc/incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/main/java/org/apache/slider/providers/hbase/HBaseProviderService.java?rev=1593301&r1=1593300&r2=1593301&view=diff
==============================================================================
--- incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/main/java/org/apache/slider/providers/hbase/HBaseProviderService.java (original)
+++ incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/main/java/org/apache/slider/providers/hbase/HBaseProviderService.java Thu May 8 14:51:39 2014
@@ -151,12 +151,12 @@ public class HBaseProviderService extend
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
Modified: incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/HBaseTestUtils.groovy
URL: http://svn.apache.org/viewvc/incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/HBaseTestUtils.groovy?rev=1593301&r1=1593300&r2=1593301&view=diff
==============================================================================
--- incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/HBaseTestUtils.groovy (original)
+++ incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/HBaseTestUtils.groovy Thu May 8 14:51:39 2014
@@ -198,7 +198,7 @@ class HBaseTestUtils extends SliderTestU
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;
}
Modified: incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/failures/TestKilledAM.groovy
URL: http://svn.apache.org/viewvc/incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/failures/TestKilledAM.groovy?rev=1593301&r1=1593300&r2=1593301&view=diff
==============================================================================
--- incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/failures/TestKilledAM.groovy (original)
+++ incubator/slider/trunk/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/failures/TestKilledAM.groovy Thu May 8 14:51:39 2014
@@ -48,7 +48,7 @@ class TestKilledAM extends HBaseMiniClus
@Test
public void testKilledAM() throws Throwable {
- skip("failing")
+// skip("failing")
String clustername = "test_killed_am"
int regionServerCount = 1