Merge branch 'develop' into feature/package_simplification_II
Conflicts:
slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java
diff --git a/bin/windows/hadoop-2.6.0-SNAPSHOT/bin/hadoop.dll b/bin/windows/hadoop-2.6.0-SNAPSHOT/bin/hadoop.dll
deleted file mode 100644
index 8da86d2..0000000
--- a/bin/windows/hadoop-2.6.0-SNAPSHOT/bin/hadoop.dll
+++ /dev/null
Binary files differ
diff --git a/bin/windows/hadoop-2.6.0-SNAPSHOT/bin/hdfs.dll b/bin/windows/hadoop-2.6.0-SNAPSHOT/bin/hdfs.dll
deleted file mode 100644
index d96248c..0000000
--- a/bin/windows/hadoop-2.6.0-SNAPSHOT/bin/hdfs.dll
+++ /dev/null
Binary files differ
diff --git a/bin/windows/hadoop-2.6.0-SNAPSHOT/bin/winutils.exe b/bin/windows/hadoop-2.6.0-SNAPSHOT/bin/winutils.exe
deleted file mode 100644
index a4edc85..0000000
--- a/bin/windows/hadoop-2.6.0-SNAPSHOT/bin/winutils.exe
+++ /dev/null
Binary files differ
diff --git a/bin/windows/hadoop-2.6.0-SNAPSHOT/readme.md b/bin/windows/hadoop-2.6.0-SNAPSHOT/readme.md
deleted file mode 100644
index 9e4dd52..0000000
--- a/bin/windows/hadoop-2.6.0-SNAPSHOT/readme.md
+++ /dev/null
@@ -1,22 +0,0 @@
-<!---
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License. See accompanying LICENSE file.
--->
-
-# Windows Binaries
-
-This directory contains the native libraries needed for running Hadoop on
-windows. It's here so that jenkins builds on windows do not
-need to rely on a pre-installed version of hadoop.
-
-To ise
-
\ No newline at end of file
diff --git a/bin/windows/hadoop-2.6.0/bin/hadoop.dll b/bin/windows/hadoop-2.6.0/bin/hadoop.dll
deleted file mode 100644
index 78ad8a8..0000000
--- a/bin/windows/hadoop-2.6.0/bin/hadoop.dll
+++ /dev/null
Binary files differ
diff --git a/bin/windows/hadoop-2.6.0/bin/hadoop.pdb b/bin/windows/hadoop-2.6.0/bin/hadoop.pdb
deleted file mode 100644
index 3701ec8..0000000
--- a/bin/windows/hadoop-2.6.0/bin/hadoop.pdb
+++ /dev/null
Binary files differ
diff --git a/bin/windows/hadoop-2.6.0/bin/hdfs.dll b/bin/windows/hadoop-2.6.0/bin/hdfs.dll
deleted file mode 100644
index 9ce72c8..0000000
--- a/bin/windows/hadoop-2.6.0/bin/hdfs.dll
+++ /dev/null
Binary files differ
diff --git a/bin/windows/hadoop-2.6.0/bin/hdfs.pdb b/bin/windows/hadoop-2.6.0/bin/hdfs.pdb
deleted file mode 100644
index 8d4c06c..0000000
--- a/bin/windows/hadoop-2.6.0/bin/hdfs.pdb
+++ /dev/null
Binary files differ
diff --git a/bin/windows/hadoop-2.6.0/bin/winutils.exe b/bin/windows/hadoop-2.6.0/bin/winutils.exe
deleted file mode 100644
index 6fbbd20..0000000
--- a/bin/windows/hadoop-2.6.0/bin/winutils.exe
+++ /dev/null
Binary files differ
diff --git a/bin/windows/hadoop-2.6.0/bin/winutils.pdb b/bin/windows/hadoop-2.6.0/bin/winutils.pdb
deleted file mode 100644
index bab211f..0000000
--- a/bin/windows/hadoop-2.6.0/bin/winutils.pdb
+++ /dev/null
Binary files differ
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 4eadf13..d2298f0 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
@@ -20,6 +20,7 @@
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
+
import org.apache.commons.io.FileUtils;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FSDataOutputStream;
@@ -1713,6 +1714,13 @@
cmd.setHostname(getClusterInfoPropertyValue(StatusKeys.INFO_AM_HOSTNAME));
response.addExecutionCommand(cmd);
+
+ log.debug("command looks like: " + cmd.toString());
+ }
+
+ private Map<String, Map<String, String>> buildComponentConfigurations(
+ ConfTreeOperations appConf) {
+ return appConf.getComponents();
}
protected static String getPackageListFromApplication(Application application) {
@@ -1878,7 +1886,8 @@
}
response.addExecutionCommand(cmd);
-
+
+ log.debug("command looks like: " + cmd.toString());
// With start command, the corresponding command for graceful stop needs to
// be sent. This will be used when a particular container is lost as per RM,
// but then the agent is still running and heart-beating to the Slider AM.
diff --git a/slider-core/src/main/java/org/apache/slider/server/appmaster/web/rest/agent/ExecutionCommand.java b/slider-core/src/main/java/org/apache/slider/server/appmaster/web/rest/agent/ExecutionCommand.java
index eca5e7d..ea6e74d 100644
--- a/slider-core/src/main/java/org/apache/slider/server/appmaster/web/rest/agent/ExecutionCommand.java
+++ b/slider-core/src/main/java/org/apache/slider/server/appmaster/web/rest/agent/ExecutionCommand.java
@@ -44,6 +44,7 @@
private Map<String, String> roleParams = null;
private String roleCommand;
private Map<String, Map<String, String>> configurations;
+ private Map<String, Map<String, String>> componentConfigurations;
private Map<String, String> commandParams;
private String serviceName;
private String componentName;
@@ -193,6 +194,15 @@
this.componentName = componentName;
}
+ public Map<String, Map<String, String>> getComponentConfigurations() {
+ return componentConfigurations;
+ }
+
+ public void setComponentConfigurations(
+ Map<String, Map<String, String>> componentConfigurations) {
+ this.componentConfigurations = componentConfigurations;
+ }
+
@Override
public String toString() {
StringBuilder builder = new StringBuilder();
