Repository: incubator-slider Updated Branches: refs/heads/develop 713ca4189 -> f0a30fd9f
SLIDER-679 remove all uses of SliderXmlConfKeys.REGISTRY_PATH from source Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/a4507439 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/a4507439 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/a4507439 Branch: refs/heads/develop Commit: a450743964f67ca2546b211ae27836fb0142f4b2 Parents: 713ca41 Author: Steve Loughran <[email protected]> Authored: Tue Nov 25 17:00:53 2014 +0000 Committer: Steve Loughran <[email protected]> Committed: Tue Nov 25 17:00:53 2014 +0000 ---------------------------------------------------------------------- .../org/apache/slider/client/SliderClient.java | 5 ++-- .../apache/slider/common/SliderXmlConfKeys.java | 28 +++++++++++--------- .../agent/TestAgentProviderService.java | 7 ++--- 3 files changed, 21 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/a4507439/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 21c4965..4a3cb4e 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 @@ -1405,8 +1405,9 @@ public class SliderClient extends AbstractSliderLaunchedService implements RunSe /** * pass the registry binding */ - addConfOptionToCLI(commandLine, config, REGISTRY_PATH, - DEFAULT_REGISTRY_PATH); + addConfOptionToCLI(commandLine, config, + RegistryConstants.KEY_REGISTRY_ZK_ROOT, + RegistryConstants.DEFAULT_ZK_REGISTRY_ROOT); addMandatoryConfOptionToCLI(commandLine, config, RegistryConstants.KEY_REGISTRY_ZK_QUORUM); http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/a4507439/slider-core/src/main/java/org/apache/slider/common/SliderXmlConfKeys.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/common/SliderXmlConfKeys.java b/slider-core/src/main/java/org/apache/slider/common/SliderXmlConfKeys.java index a967ebf..24040af 100644 --- a/slider-core/src/main/java/org/apache/slider/common/SliderXmlConfKeys.java +++ b/slider-core/src/main/java/org/apache/slider/common/SliderXmlConfKeys.java @@ -109,34 +109,38 @@ public interface SliderXmlConfKeys { */ String CLUSTER_DIRECTORY_PERMISSIONS = "slider.cluster.directory.permissions"; + /** * Default value for the permissions :{@value} */ String DEFAULT_CLUSTER_DIRECTORY_PERMISSIONS = "750"; - /**: {@value} - * Option for the permissions for the data directory itself + + /** + * + * Option for the permissions for the data directory itself: {@value} */ String DATA_DIRECTORY_PERMISSIONS = "slider.data.directory.permissions"; + /** * Default value for the data directory permissions: {@value} */ String DEFAULT_DATA_DIRECTORY_PERMISSIONS = "750"; - - String REGISTRY_PATH = "slider.registry.path"; - /** - * Default value for the registry: {@value} + * + * Use {@link RegistryConstants#KEY_REGISTRY_ZK_ROOT} + * */ - String DEFAULT_REGISTRY_PATH = RegistryConstants.DEFAULT_ZK_REGISTRY_ROOT; - - - String REGISTRY_ZK_QUORUM = "slider.zookeeper.quorum"; + @Deprecated + String REGISTRY_PATH = "slider.registry.path"; /** - * Default value for the registry: {@value} + * + * @Deprecated use {@link RegistryConstants#KEY_REGISTRY_ZK_QUORUM} + * */ - String DEFAULT_REGISTRY_ZK_QUORUM = "localhost:2181"; + @Deprecated + String REGISTRY_ZK_QUORUM = "slider.zookeeper.quorum"; String IPC_CLIENT_FALLBACK_TO_SIMPLE_AUTH = http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/a4507439/slider-core/src/test/java/org/apache/slider/providers/agent/TestAgentProviderService.java ---------------------------------------------------------------------- diff --git a/slider-core/src/test/java/org/apache/slider/providers/agent/TestAgentProviderService.java b/slider-core/src/test/java/org/apache/slider/providers/agent/TestAgentProviderService.java index 2c977f4..dbc1b0a 100644 --- a/slider-core/src/test/java/org/apache/slider/providers/agent/TestAgentProviderService.java +++ b/slider-core/src/test/java/org/apache/slider/providers/agent/TestAgentProviderService.java @@ -25,7 +25,6 @@ import org.apache.hadoop.fs.Path; import org.apache.hadoop.registry.client.api.RegistryConstants; import org.apache.hadoop.registry.client.api.RegistryOperations; import org.apache.hadoop.registry.client.types.ServiceRecord; -import org.apache.hadoop.yarn.api.records.ApplicationAttemptId; import org.apache.hadoop.yarn.api.records.Container; import org.apache.hadoop.yarn.api.records.ContainerId; import org.apache.hadoop.yarn.api.records.ContainerLaunchContext; @@ -38,7 +37,6 @@ import org.apache.slider.api.ClusterNode; import org.apache.slider.api.InternalKeys; import org.apache.slider.api.OptionKeys; import org.apache.slider.common.SliderKeys; -import org.apache.slider.common.SliderXmlConfKeys; import org.apache.slider.common.tools.SliderFileSystem; import org.apache.slider.core.conf.AggregateConf; import org.apache.slider.core.conf.ConfTree; @@ -98,7 +96,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Set; -import java.util.concurrent.ConcurrentHashMap; import static org.easymock.EasyMock.anyObject; import static org.easymock.EasyMock.createNiceMock; @@ -1301,8 +1298,8 @@ public class TestAgentProviderService { protected YarnRegistryViewForProviders createYarnRegistryViewForProviders( Configuration conf) throws IOException { - conf.set(SliderXmlConfKeys.REGISTRY_PATH, - SliderXmlConfKeys.DEFAULT_REGISTRY_PATH); + conf.set(RegistryConstants.KEY_REGISTRY_ZK_ROOT, + RegistryConstants.DEFAULT_ZK_REGISTRY_ROOT); RegistryOperations registryOperations = new MockRegistryOperations(); registryOperations.init(conf);
