You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by sm...@apache.org on 2014/07/11 06:18:05 UTC
[25/50] [abbrv] git commit: SLIDER-166. agent.ini should be supported
by default (Gour Saha via smohanty)
SLIDER-166. agent.ini should be supported by default (Gour Saha via smohanty)
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/adc7f4f1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/adc7f4f1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/adc7f4f1
Branch: refs/heads/master
Commit: adc7f4f13376170ce9d97c070a930697942f0ef8
Parents: c305ce9
Author: Sumit Mohanty <sm...@hortonworks.com>
Authored: Tue Jul 8 10:16:31 2014 -0700
Committer: Sumit Mohanty <sm...@hortonworks.com>
Committed: Tue Jul 8 10:16:31 2014 -0700
----------------------------------------------------------------------
app-packages/accumulo/appConfig.json | 1 -
.../command-logger/slider-pkg/appConfig.json | 1 -
app-packages/hbase/appConfig.json | 1 -
app-packages/storm-v0_91/appConfig.json | 1 -
.../slider/providers/agent/AgentClientProvider.java | 16 +++++-----------
.../apache/slider/providers/agent/AgentKeys.java | 4 ----
.../providers/agent/AgentProviderService.java | 12 +++++++-----
7 files changed, 12 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/adc7f4f1/app-packages/accumulo/appConfig.json
----------------------------------------------------------------------
diff --git a/app-packages/accumulo/appConfig.json b/app-packages/accumulo/appConfig.json
index 6a22336..8fe9a18 100644
--- a/app-packages/accumulo/appConfig.json
+++ b/app-packages/accumulo/appConfig.json
@@ -3,7 +3,6 @@
"metadata": {
},
"global": {
- "agent.conf": "agent.ini",
"application.def": "${app.package.name}.zip",
"config_types": "accumulo-site",
"java_home": "/usr/jdk64/jdk1.7.0_45",
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/adc7f4f1/app-packages/command-logger/slider-pkg/appConfig.json
----------------------------------------------------------------------
diff --git a/app-packages/command-logger/slider-pkg/appConfig.json b/app-packages/command-logger/slider-pkg/appConfig.json
index e7f9700..1d92c59 100644
--- a/app-packages/command-logger/slider-pkg/appConfig.json
+++ b/app-packages/command-logger/slider-pkg/appConfig.json
@@ -3,7 +3,6 @@
"metadata": {
},
"global": {
- "agent.conf": "agent.ini",
"application.def": "apache-slider-command-logger.zip",
"config_types": "cl-site",
"java_home": "/usr/jdk64/jdk1.7.0_45",
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/adc7f4f1/app-packages/hbase/appConfig.json
----------------------------------------------------------------------
diff --git a/app-packages/hbase/appConfig.json b/app-packages/hbase/appConfig.json
index 07187ec..20cd436 100644
--- a/app-packages/hbase/appConfig.json
+++ b/app-packages/hbase/appConfig.json
@@ -3,7 +3,6 @@
"metadata": {
},
"global": {
- "agent.conf": "agent.ini",
"application.def": "${app.package.name}.zip",
"create.default.zookeeper.node": "true",
"config_types": "core-site,hdfs-site,hbase-site",
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/adc7f4f1/app-packages/storm-v0_91/appConfig.json
----------------------------------------------------------------------
diff --git a/app-packages/storm-v0_91/appConfig.json b/app-packages/storm-v0_91/appConfig.json
index d6a6679..7ccf412 100644
--- a/app-packages/storm-v0_91/appConfig.json
+++ b/app-packages/storm-v0_91/appConfig.json
@@ -3,7 +3,6 @@
"metadata": {
},
"global": {
- "agent.conf": "/slider/agent/conf/agent.ini",
"application.def": "/slider/storm_v091.zip",
"config_types": "storm-site",
"java_home": "/usr/jdk64/jdk1.7.0_45",
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/adc7f4f1/slider-core/src/main/java/org/apache/slider/providers/agent/AgentClientProvider.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/providers/agent/AgentClientProvider.java b/slider-core/src/main/java/org/apache/slider/providers/agent/AgentClientProvider.java
index f3e2dd7..3835df6 100644
--- a/slider-core/src/main/java/org/apache/slider/providers/agent/AgentClientProvider.java
+++ b/slider-core/src/main/java/org/apache/slider/providers/agent/AgentClientProvider.java
@@ -18,6 +18,7 @@
package org.apache.slider.providers.agent;
+import org.apache.commons.lang.StringUtils;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.Path;
import org.apache.slider.api.OptionKeys;
@@ -93,8 +94,10 @@ public class AgentClientProvider extends AbstractClientProvider
sliderFileSystem.verifyFileExists(appDefPath);
String agentConf = instanceDefinition.getAppConfOperations().
- getGlobalOptions().getMandatoryOption(AgentKeys.AGENT_CONF);
- sliderFileSystem.verifyFileExists(new Path(agentConf));
+ getGlobalOptions().getOption(AgentKeys.AGENT_CONF, "");
+ if (StringUtils.isNotEmpty(agentConf)) {
+ sliderFileSystem.verifyFileExists(new Path(agentConf));
+ }
String appHome = instanceDefinition.getAppConfOperations().
getGlobalOptions().get(AgentKeys.PACKAGE_PATH);
@@ -173,15 +176,6 @@ public class AgentClientProvider extends AbstractClientProvider
OptionKeys.INTERNAL_APPLICATION_IMAGE_PATH
+ " must be provided.");
}
-
- try {
- // Validate the agent config
- instanceDefinition.getAppConfOperations().
- getGlobalOptions().getMandatoryOption(AgentKeys.AGENT_CONF);
- } catch (BadConfigException bce) {
- throw new BadConfigException("Agent config "+ AgentKeys.AGENT_CONF
- + " property must be provided.");
- }
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/adc7f4f1/slider-core/src/main/java/org/apache/slider/providers/agent/AgentKeys.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/providers/agent/AgentKeys.java b/slider-core/src/main/java/org/apache/slider/providers/agent/AgentKeys.java
index 019a8e6..96acd41 100644
--- a/slider-core/src/main/java/org/apache/slider/providers/agent/AgentKeys.java
+++ b/slider-core/src/main/java/org/apache/slider/providers/agent/AgentKeys.java
@@ -28,10 +28,6 @@ public interface AgentKeys {
/**
* {@value}
*/
- String CONF_FILE = "agent.conf";
- /**
- * {@value}
- */
String REGION_SERVER = "regionserver";
/**
* What is the command for hbase to print a version: {@value}
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/adc7f4f1/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java b/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java
index 6cd3d9e..3430baf 100644
--- a/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java
+++ b/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java
@@ -234,11 +234,13 @@ public class AgentProviderService extends AbstractProviderService implements
launcher.addLocalResource(AgentKeys.APP_DEFINITION_DIR, appDefRes);
String agentConf = instanceDefinition.getAppConfOperations().
- getGlobalOptions().getMandatoryOption(AgentKeys.AGENT_CONF);
- LocalResource agentConfRes = fileSystem.createAmResource(
- fileSystem.getFileSystem().resolvePath(new Path(agentConf)),
- LocalResourceType.FILE);
- launcher.addLocalResource(AgentKeys.AGENT_CONFIG_FILE, agentConfRes);
+ getGlobalOptions().getOption(AgentKeys.AGENT_CONF, "");
+ if (org.apache.commons.lang.StringUtils.isNotEmpty(agentConf)) {
+ LocalResource agentConfRes = fileSystem.createAmResource(fileSystem
+ .getFileSystem().resolvePath(new Path(agentConf)),
+ LocalResourceType.FILE);
+ launcher.addLocalResource(AgentKeys.AGENT_CONFIG_FILE, agentConfRes);
+ }
String agentVer = instanceDefinition.getAppConfOperations().
getGlobalOptions().getOption(AgentKeys.AGENT_VERSION, null);