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/11/25 20:20:17 UTC
[1/2] incubator-slider git commit: SLIDER-679 remove all uses of
SliderXmlConfKeys.REGISTRY_PATH from source
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 <st...@apache.org>
Authored: Tue Nov 25 17:00:53 2014 +0000
Committer: Steve Loughran <st...@apache.org>
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);
[2/2] incubator-slider git commit: SLIDER-680 cut test option to
choose between shell and .py script as obsolete
Posted by st...@apache.org.
SLIDER-680 cut test option to choose between shell and .py script as obsolete
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/f0a30fd9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/f0a30fd9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/f0a30fd9
Branch: refs/heads/develop
Commit: f0a30fd9fff7353dbb6b9e376be19a79e9f10064
Parents: a450743
Author: Steve Loughran <st...@apache.org>
Authored: Tue Nov 25 17:14:32 2014 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Tue Nov 25 17:14:32 2014 +0000
----------------------------------------------------------------------
.../apache/slider/funtest/framework/CommandTestBase.groovy | 7 ++-----
.../apache/slider/funtest/framework/FuntestProperties.groovy | 4 ----
2 files changed, 2 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/f0a30fd9/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/CommandTestBase.groovy
----------------------------------------------------------------------
diff --git a/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/CommandTestBase.groovy b/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/CommandTestBase.groovy
index 1cb245a..b3959af 100644
--- a/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/CommandTestBase.groovy
+++ b/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/CommandTestBase.groovy
@@ -121,8 +121,6 @@ abstract class CommandTestBase extends SliderTestUtils {
TEST_AM_KEYTAB = SLIDER_CONFIG.getTrimmed(
KEY_TEST_AM_KEYTAB)
-
-
TILDE = Shell.WINDOWS? "~" : "\\~"
}
@@ -137,11 +135,10 @@ abstract class CommandTestBase extends SliderTestUtils {
SliderShell.confDir = SLIDER_CONF_DIRECTORY
- // choose python script if on windows or the launch key recommends it
+ // choose python script if on windows
//
- boolean python = SLIDER_CONFIG.getBoolean(KEY_LAUNCH_PYTHON, false)
SliderShell.scriptFile =
- (SliderShell.windows || python) ? SLIDER_SCRIPT_PYTHON : SLIDER_SCRIPT
+ SliderShell.windows ? SLIDER_SCRIPT_PYTHON : SLIDER_SCRIPT
//set the property of the configuration directory
def path = SLIDER_CONF_DIRECTORY.absolutePath
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/f0a30fd9/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/FuntestProperties.groovy
----------------------------------------------------------------------
diff --git a/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/FuntestProperties.groovy b/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/FuntestProperties.groovy
index 92a7a95..2b13d13 100644
--- a/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/FuntestProperties.groovy
+++ b/slider-funtest/src/main/groovy/org/apache/slider/funtest/framework/FuntestProperties.groovy
@@ -75,8 +75,4 @@ public interface FuntestProperties extends SliderXMLConfKeysForTesting {
String HDFS_SITE_XML = "hdfs-site.xml"
String YARN_SITE_XML = "yarn-site.xml"
- /**
- * Flag to indicate that the .py script should be launched: {@value}
- */
- String KEY_LAUNCH_PYTHON = "slider.test.launch.python"
}