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/09/23 23:00:38 UTC
[11/19] git commit: SLIDER-180. Changes to allow auto-build of hbase
win package (added missing property)
SLIDER-180. Changes to allow auto-build of hbase win package (added missing property)
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/e7c78605
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/e7c78605
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/e7c78605
Branch: refs/heads/feature/SLIDER-149_Support_a_YARN_service_registry
Commit: e7c78605e768e5a63326c2631e0f86e00368729d
Parents: a1086e0
Author: Sumit Mohanty <sm...@hortonworks.com>
Authored: Tue Sep 23 06:58:35 2014 -0700
Committer: Sumit Mohanty <sm...@hortonworks.com>
Committed: Tue Sep 23 06:58:35 2014 -0700
----------------------------------------------------------------------
app-packages/hbase-win/appConfig.json | 1 +
.../org/apache/slider/providers/agent/AgentProviderService.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/e7c78605/app-packages/hbase-win/appConfig.json
----------------------------------------------------------------------
diff --git a/app-packages/hbase-win/appConfig.json b/app-packages/hbase-win/appConfig.json
index 6f07d34..5b97e69 100644
--- a/app-packages/hbase-win/appConfig.json
+++ b/app-packages/hbase-win/appConfig.json
@@ -5,6 +5,7 @@
"global": {
"application.def": ".slider/package/HBASE/slider-hbase-app-win-package-${bld.version}.zip",
"create.default.zookeeper.node": "true",
+ "java_home": "C:\\java",
"site.global.app_user": "hadoop",
"site.global.app_root": "${AGENT_WORK_ROOT}/app/install/hbase-${pkg.version}",
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/e7c78605/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 bb98588..6976f50 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
@@ -567,8 +567,8 @@ public class AgentProviderService extends AbstractProviderService implements
response.setRestartEnabled(true);
}
} catch (SliderException e) {
- componentStatus.applyCommandResult(CommandResult.FAILED, command);
log.warn("Component instance failed operation.", e);
+ componentStatus.applyCommandResult(CommandResult.FAILED, command);
}
log.debug("Heartbeat response: " + response);