SLIDER-322 hbase and accumulo -> java6 language
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/280afd88 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/280afd88 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/280afd88 Branch: refs/heads/feature/SLIDER-149_Support_a_YARN_service_registry Commit: 280afd88960457864e214da9254242c57a023fc6 Parents: 397585a Author: Steve Loughran <ste...@apache.org> Authored: Thu Aug 14 17:47:01 2014 +0100 Committer: Steve Loughran <ste...@apache.org> Committed: Thu Aug 14 17:47:01 2014 +0100 ---------------------------------------------------------------------- .../accumulo/AccumuloProviderService.java | 19 ++++++++++-- .../providers/hbase/HBaseClientProvider.java | 6 ++-- .../providers/hbase/HBaseProviderService.java | 31 +++++++++++++++++++- 3 files changed, 49 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/280afd88/slider-providers/accumulo/slider-accumulo-provider/src/main/java/org/apache/slider/providers/accumulo/AccumuloProviderService.java ---------------------------------------------------------------------- diff --git a/slider-providers/accumulo/slider-accumulo-provider/src/main/java/org/apache/slider/providers/accumulo/AccumuloProviderService.java b/slider-providers/accumulo/slider-accumulo-provider/src/main/java/org/apache/slider/providers/accumulo/AccumuloProviderService.java index 7dedd2c..b8f4c00 100644 --- a/slider-providers/accumulo/slider-accumulo-provider/src/main/java/org/apache/slider/providers/accumulo/AccumuloProviderService.java +++ b/slider-providers/accumulo/slider-accumulo-provider/src/main/java/org/apache/slider/providers/accumulo/AccumuloProviderService.java @@ -170,6 +170,8 @@ public class AccumuloProviderService extends AbstractProviderService implements String heap = "-Xmx" + appComponent.getOption(RoleKeys.JVM_HEAP, DEFAULT_JVM_HEAP); String opt = "ACCUMULO_OTHER_OPTS"; if (SliderUtils.isSet(heap)) { +/* JDK7 + switch (role) { case AccumuloKeys.ROLE_MASTER: opt = "ACCUMULO_MASTER_OPTS"; @@ -184,6 +186,16 @@ public class AccumuloProviderService extends AbstractProviderService implements opt = "ACCUMULO_GC_OPTS"; break; } +*/ + if (AccumuloKeys.ROLE_MASTER.equals(role)) { + opt = "ACCUMULO_MASTER_OPTS"; + } else if (AccumuloKeys.ROLE_TABLET.equals(role)) { + opt = "ACCUMULO_TSERVER_OPTS"; + } else if (AccumuloKeys.ROLE_MONITOR.equals(role)) { + opt = "ACCUMULO_MONITOR_OPTS"; + } else if (AccumuloKeys.ROLE_GARBAGE_COLLECTOR.equals(role)) { + opt = "ACCUMULO_GC_OPTS"; + } launcher.setEnv(opt, heap); } @@ -239,7 +251,7 @@ public class AccumuloProviderService extends AbstractProviderService implements String accumuloScript = AccumuloClientProvider.buildScriptBinPath(instance); - List<String> launchSequence = new ArrayList<>(8); + List<String> launchSequence = new ArrayList<String>(8); launchSequence.add(0, accumuloScript); Collections.addAll(launchSequence, commands); return launchSequence; @@ -338,7 +350,8 @@ public class AccumuloProviderService extends AbstractProviderService implements InternalKeys.DEFAULT_INTERNAL_CONTAINER_STARTUP_DELAY); ProviderCompletedCallable completedCallable = new ProviderCompletedCallable(execInProgress, null); - Service notifier = new WorkflowCallbackService<>( + // JDK7 + Service notifier = new WorkflowCallbackService( "accumulo notifier", completedCallable, delay, @@ -389,7 +402,7 @@ public class AccumuloProviderService extends AbstractProviderService implements @Override public Map<String, String> buildProviderStatus() { - Map<String,String> status = new HashMap<>(); + Map<String,String> status = new HashMap<String, String>(); return status; http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/280afd88/slider-providers/hbase/slider-hbase-provider/src/main/java/org/apache/slider/providers/hbase/HBaseClientProvider.java ---------------------------------------------------------------------- diff --git a/slider-providers/hbase/slider-hbase-provider/src/main/java/org/apache/slider/providers/hbase/HBaseClientProvider.java b/slider-providers/hbase/slider-hbase-provider/src/main/java/org/apache/slider/providers/hbase/HBaseClientProvider.java index 76bf73a..9ad872f 100644 --- a/slider-providers/hbase/slider-hbase-provider/src/main/java/org/apache/slider/providers/hbase/HBaseClientProvider.java +++ b/slider-providers/hbase/slider-hbase-provider/src/main/java/org/apache/slider/providers/hbase/HBaseClientProvider.java @@ -108,7 +108,7 @@ public class HBaseClientProvider extends AbstractClientProvider implements MapOperations worker = appconf.getMandatoryComponent(HBaseKeys.ROLE_WORKER); - Map<String, String> sitexml = new HashMap<>(); + Map<String, String> sitexml = new HashMap<String, String>(); //map all cluster-wide site. options providerUtils.propagateSiteOptions(globalAppOptions, sitexml); @@ -210,7 +210,7 @@ public class HBaseClientProvider extends AbstractClientProvider implements } } - private static Set<String> knownRoleNames = new HashSet<>(); + private static Set<String> knownRoleNames = new HashSet<String>(); static { List<ProviderRole> roles = HBaseRoles.getRoles(); knownRoleNames.add(SliderKeys.COMPONENT_AM); @@ -263,7 +263,7 @@ public class HBaseClientProvider extends AbstractClientProvider implements // add any and all dependency files Map<String, LocalResource> providerResources = - new HashMap<>(); + new HashMap<String, LocalResource>(); ProviderUtils.addProviderJar(providerResources, this, http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/280afd88/slider-providers/hbase/slider-hbase-provider/src/main/java/org/apache/slider/providers/hbase/HBaseProviderService.java ---------------------------------------------------------------------- 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 feffb08..1fb392c 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 @@ -180,6 +180,8 @@ public class HBaseProviderService extends AbstractProviderService implements String roleCommand; String logfile; //now look at the role + +/* JDK7 switch (role) { case ROLE_WORKER: //role is region server @@ -210,6 +212,33 @@ public class HBaseProviderService extends AbstractProviderService implements throw new SliderInternalStateException("Cannot start role %s", role); } +*/ + if (ROLE_WORKER.equals(role)) { + //role is region server + roleCommand = REGION_SERVER; + logfile = "/region-server.txt"; + + } else if (ROLE_MASTER.equals(role)) { + roleCommand = MASTER; + logfile = "/master.txt"; + + } else if (ROLE_REST_GATEWAY.equals(role)) { + roleCommand = REST_GATEWAY; + logfile = "/rest-gateway.txt"; + + } else if (ROLE_THRIFT_GATEWAY.equals(role)) { + roleCommand = THRIFT_GATEWAY; + logfile = "/thrift-gateway.txt"; + + } else if (ROLE_THRIFT2_GATEWAY.equals(role)) { + roleCommand = THRIFT2_GATEWAY; + logfile = "/thrift2-gateway.txt"; + } + + else { + throw new SliderInternalStateException("Cannot start role %s", role); + } + cli.add(roleCommand); cli.add(ACTION_START); //log details @@ -319,7 +348,7 @@ public class HBaseProviderService extends AbstractProviderService implements * @return the provider status - map of entries to add to the info section */ public Map<String, String> buildProviderStatus() { - Map<String, String> stats = new HashMap<>(); + Map<String, String> stats = new HashMap<String, String>(); return stats; }
