SLIDER-149/YARN-913 persistence policy set via set() method
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/330579e4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/330579e4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/330579e4 Branch: refs/heads/feature/SLIDER-481_allow_dedicated_handling_of_exports Commit: 330579e47f8bc3cd520d23a0e3c4bcae10d2ee45 Parents: 27381a6 Author: Steve Loughran <[email protected]> Authored: Mon Oct 6 21:42:39 2014 -0700 Committer: Steve Loughran <[email protected]> Committed: Mon Oct 6 21:42:39 2014 -0700 ---------------------------------------------------------------------- .../java/org/apache/slider/client/SliderClient.java | 5 +++-- .../slider/server/appmaster/SliderAppMaster.java | 16 ++++++++++------ .../standalone/TestStandaloneYarnRegistryAM.groovy | 7 ++++--- .../providers/hbase/HBaseProviderService.java | 9 ++++++--- 4 files changed, 23 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/330579e4/slider-core/src/main/java/org/apache/slider/client/SliderClient.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/client/SliderClient.java b/slider-core/src/main/java/org/apache/slider/client/SliderClient.java index 602d6cf..b3365a7 100644 --- a/slider-core/src/main/java/org/apache/slider/client/SliderClient.java +++ b/slider-core/src/main/java/org/apache/slider/client/SliderClient.java @@ -49,6 +49,7 @@ import org.apache.hadoop.yarn.registry.client.binding.RegistryUtils; import org.apache.hadoop.yarn.registry.client.exceptions.NoRecordException; import org.apache.hadoop.yarn.registry.client.types.Endpoint; import org.apache.hadoop.yarn.registry.client.types.ServiceRecord; +import org.apache.hadoop.yarn.registry.client.types.yarn.YarnRegistryAttributes; import org.apache.slider.api.ClusterDescription; import org.apache.slider.api.ClusterNode; import org.apache.slider.api.InternalKeys; @@ -2789,9 +2790,9 @@ public class SliderClient extends AbstractSliderLaunchedService implements RunSe private void logInstance(ServiceRecord instance, boolean verbose) { if (!verbose) { - log.info("{}", instance.getYarn_id()); + log.info("{}", instance.get(YarnRegistryAttributes.YARN_ID, "")); } else { - log.info("{}: ", instance.getYarn_id()); + log.info("{}: ", instance.get(YarnRegistryAttributes.YARN_ID, "")); logEndpoints(instance); } } http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/330579e4/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java b/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java index 6f7275c..5f7ebe6 100644 --- a/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java +++ b/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java @@ -59,6 +59,7 @@ import org.apache.hadoop.yarn.registry.client.binding.RegistryPathUtils; import org.apache.hadoop.yarn.registry.client.types.yarn.PersistencePolicies; import org.apache.hadoop.yarn.registry.client.types.ServiceRecord; import org.apache.hadoop.yarn.registry.client.binding.RegistryTypeUtils; +import org.apache.hadoop.yarn.registry.client.types.yarn.YarnRegistryAttributes; import org.apache.hadoop.yarn.registry.server.integration.RMRegistryOperationsService; import org.apache.hadoop.yarn.security.AMRMTokenIdentifier; import org.apache.hadoop.yarn.security.client.ClientToAMTokenSecretManager; @@ -931,8 +932,9 @@ public class SliderAppMaster extends AbstractSliderLaunchedService // Yarn registry ServiceRecord serviceRecord = new ServiceRecord(); - serviceRecord.putYarn_id(appid.toString()); - serviceRecord.putYarn_persistence(PersistencePolicies.APPLICATION); + serviceRecord.set(YarnRegistryAttributes.YARN_ID, appid.toString()); + serviceRecord.set(YarnRegistryAttributes.YARN_PERSISTENCE, + PersistencePolicies.APPLICATION); serviceRecord.description = "Slider Application Master"; serviceRecord.addExternalEndpoint( @@ -964,8 +966,9 @@ public class SliderAppMaster extends AbstractSliderLaunchedService // and a shorter lived binding to the app String attempt = appAttemptID.toString(); ServiceRecord attemptRecord = new ServiceRecord(serviceRecord); - attemptRecord.putYarn_id(attempt); - attemptRecord.putYarn_persistence(PersistencePolicies.APPLICATION_ATTEMPT); + attemptRecord.set(YarnRegistryAttributes.YARN_ID, attempt); + attemptRecord.set(YarnRegistryAttributes.YARN_PERSISTENCE, + PersistencePolicies.APPLICATION_ATTEMPT); yarnRegistryOperations.putComponent( RegistryPathUtils.encodeYarnID(attempt), serviceRecord); @@ -1008,9 +1011,10 @@ public class SliderAppMaster extends AbstractSliderLaunchedService log.info("Registering component {}", id); String cid = RegistryPathUtils.encodeYarnID(id.toString()); ServiceRecord container = new ServiceRecord(); - container.putYarn_id(cid); + container.set(YarnRegistryAttributes.YARN_ID, cid); container.description = description; - container.putYarn_persistence(PersistencePolicies.CONTAINER); + container.set(YarnRegistryAttributes.YARN_PERSISTENCE, + PersistencePolicies.CONTAINER); try { yarnRegistryOperations.putComponent(cid, container); } catch (IOException e) { http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/330579e4/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneYarnRegistryAM.groovy ---------------------------------------------------------------------- diff --git a/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneYarnRegistryAM.groovy b/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneYarnRegistryAM.groovy index 7e74625..62b39f0 100644 --- a/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneYarnRegistryAM.groovy +++ b/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneYarnRegistryAM.groovy @@ -329,9 +329,10 @@ class TestStandaloneYarnRegistryAM extends AgentMiniClusterTestBase { def listedInstance = client.actionRegistryList(registryArgs) def resolvedRecord = listedInstance[0] - assert resolvedRecord[YarnRegistryAttributes.YARN_ID] == serviceRecord.getYarn_id() - assert resolvedRecord[YarnRegistryAttributes.YARN_PERSISTENCE] == serviceRecord.getYarn_persistence() - + assert resolvedRecord[YarnRegistryAttributes.YARN_ID] == + serviceRecord[YarnRegistryAttributes.YARN_ID] + assert resolvedRecord[YarnRegistryAttributes.YARN_PERSISTENCE] == + serviceRecord[YarnRegistryAttributes.YARN_PERSISTENCE] // listconf registryArgs.list = false; http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/330579e4/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 ae9084b..6375d6f 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 @@ -24,6 +24,7 @@ import org.apache.hadoop.yarn.api.records.Container; import org.apache.hadoop.yarn.registry.client.binding.RegistryTypeUtils; import org.apache.hadoop.yarn.registry.client.types.yarn.PersistencePolicies; import org.apache.hadoop.yarn.registry.client.types.ServiceRecord; +import org.apache.hadoop.yarn.registry.client.types.yarn.YarnRegistryAttributes; import org.apache.slider.api.InternalKeys; import org.apache.slider.common.SliderKeys; import org.apache.slider.api.ClusterDescription; @@ -257,9 +258,11 @@ public class HBaseProviderService extends AbstractProviderService String name = amState.getApplicationName() ; ServiceRecord serviceRecord = new ServiceRecord(); // bond lifespan to the application - serviceRecord.putYarn_id(yarnRegistry.getApplicationAttemptId() - .getApplicationId().toString()); - serviceRecord.putYarn_persistence(PersistencePolicies.APPLICATION); + serviceRecord.set(YarnRegistryAttributes.YARN_ID, + yarnRegistry.getApplicationAttemptId() + .getApplicationId().toString()); + serviceRecord.set(YarnRegistryAttributes.YARN_PERSISTENCE, + PersistencePolicies.APPLICATION); try { URL configURL = new URL(amWebAPI, SLIDER_PATH_PUBLISHER + "/" + HBASE_SERVICE_TYPE);
