Repository: incubator-slider
Updated Branches:
  refs/heads/develop 18cdb000d -> fb20aceb8


SLIDER-706 app install failure doesn't result in clear failure. Just improving 
logging to see what the next state is —to understand what is the next state


Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/cd09a642
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/cd09a642
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/cd09a642

Branch: refs/heads/develop
Commit: cd09a642399438a5f9195295861e409cc168c385
Parents: 49ead0d
Author: Steve Loughran <[email protected]>
Authored: Fri Feb 6 15:48:19 2015 +0000
Committer: Steve Loughran <[email protected]>
Committed: Fri Feb 6 15:48:19 2015 +0000

----------------------------------------------------------------------
 .../apache/slider/providers/agent/AgentProviderService.java | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/cd09a642/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 69857d2..310596c 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
@@ -703,18 +703,19 @@ public class AgentProviderService extends 
AbstractProviderService implements
     publishConfigAndExportGroups(heartBeat, componentStatus, roleName);
 
     List<CommandReport> reports = heartBeat.getReports();
-    if (reports != null && !reports.isEmpty()) {
+    if (SliderUtils.isNotEmpty(reports)) {
       CommandReport report = reports.get(0);
       Map<String, String> ports = report.getAllocatedPorts();
-      if (ports != null && !ports.isEmpty()) {
+      if (SliderUtils.isNotEmpty(ports)) {
         processAllocatedPorts(heartBeat.getFqdn(), roleName, containerId, 
ports);
       }
       CommandResult result = 
CommandResult.getCommandResult(report.getStatus());
       Command command = Command.getCommand(report.getRoleCommand());
       componentStatus.applyCommandResult(result, command);
-      log.info("Component operation. Status: {}", result);
+      log.info("Component operation. Status: {}; new container state: {}",
+          result, componentStatus.getContainerState());
 
-      if (command == Command.INSTALL && report.getFolders() != null && 
report.getFolders().size() > 0) {
+      if (command == Command.INSTALL && 
SliderUtils.isNotEmpty(report.getFolders())) {
         publishFolderPaths(report.getFolders(), containerId, roleName, 
heartBeat.getFqdn());
       }
     }

Reply via email to