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 2015/05/06 19:24:03 UTC
incubator-slider git commit: YARN-1564 while copying latest workflow
services to a YARN pactch, cleaned up the code
Repository: incubator-slider
Updated Branches:
refs/heads/develop fd1bad739 -> f6e2e9fcb
YARN-1564 while copying latest workflow services to a YARN pactch, cleaned up the code
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/f6e2e9fc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/f6e2e9fc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/f6e2e9fc
Branch: refs/heads/develop
Commit: f6e2e9fcb556bad7373ac900ce3d0154ecebc470
Parents: fd1bad7
Author: Steve Loughran <st...@apache.org>
Authored: Wed May 6 18:23:52 2015 +0100
Committer: Steve Loughran <st...@apache.org>
Committed: Wed May 6 18:23:52 2015 +0100
----------------------------------------------------------------------
.../utility/AbstractSliderLaunchedService.java | 6 ++----
.../slider/server/services/utility/WebAppService.java | 2 +-
.../server/services/workflow/ForkedProcessService.java | 13 ++++++-------
.../server/services/workflow/LongLivedProcess.java | 7 ++-----
.../server/services/workflow/ServiceThreadFactory.java | 4 +++-
.../services/workflow/WorkflowCallbackService.java | 8 ++++----
.../services/workflow/WorkflowSequenceService.java | 2 +-
7 files changed, 19 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/f6e2e9fc/slider-core/src/main/java/org/apache/slider/server/services/utility/AbstractSliderLaunchedService.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/server/services/utility/AbstractSliderLaunchedService.java b/slider-core/src/main/java/org/apache/slider/server/services/utility/AbstractSliderLaunchedService.java
index 10af3d3..7f3931b 100644
--- a/slider-core/src/main/java/org/apache/slider/server/services/utility/AbstractSliderLaunchedService.java
+++ b/slider-core/src/main/java/org/apache/slider/server/services/utility/AbstractSliderLaunchedService.java
@@ -18,12 +18,10 @@
package org.apache.slider.server.services.utility;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.yarn.conf.YarnConfiguration;
import org.apache.hadoop.registry.client.api.RegistryConstants;
import org.apache.hadoop.registry.client.api.RegistryOperations;
import org.apache.hadoop.registry.client.api.RegistryOperationsFactory;
-import org.apache.slider.common.SliderXmlConfKeys;
+import org.apache.hadoop.yarn.conf.YarnConfiguration;
import org.apache.slider.common.tools.ConfigHelper;
import org.apache.slider.common.tools.SliderUtils;
import org.apache.slider.core.exceptions.BadCommandArgumentsException;
@@ -40,7 +38,7 @@ public abstract class AbstractSliderLaunchedService extends
private static final Logger log =
LoggerFactory.getLogger(AbstractSliderLaunchedService.class);
- public AbstractSliderLaunchedService(String name) {
+ protected AbstractSliderLaunchedService(String name) {
super(name);
// make sure all the yarn configs get loaded
YarnConfiguration conf = new YarnConfiguration();
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/f6e2e9fc/slider-core/src/main/java/org/apache/slider/server/services/utility/WebAppService.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/server/services/utility/WebAppService.java b/slider-core/src/main/java/org/apache/slider/server/services/utility/WebAppService.java
index 23c7c9b..ebfcb99 100644
--- a/slider-core/src/main/java/org/apache/slider/server/services/utility/WebAppService.java
+++ b/slider-core/src/main/java/org/apache/slider/server/services/utility/WebAppService.java
@@ -23,7 +23,7 @@ import org.apache.hadoop.yarn.webapp.WebApp;
/**
* Contains a webapp reference and stops it in teardown if non-null
- *
+ * <p>
* It does not start the application.
* Access to the field is not synchronized across threads; it is the
* responsibility of the caller.
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/f6e2e9fc/slider-core/src/main/java/org/apache/slider/server/services/workflow/ForkedProcessService.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/server/services/workflow/ForkedProcessService.java b/slider-core/src/main/java/org/apache/slider/server/services/workflow/ForkedProcessService.java
index 9f6b327..352be49 100644
--- a/slider-core/src/main/java/org/apache/slider/server/services/workflow/ForkedProcessService.java
+++ b/slider-core/src/main/java/org/apache/slider/server/services/workflow/ForkedProcessService.java
@@ -124,7 +124,7 @@ public class ForkedProcessService
@Override //AbstractService
protected void serviceStop() throws Exception {
- completed(0);
+ completed();
stopForkedProcess();
}
@@ -185,7 +185,7 @@ public class ForkedProcessService
int code) {
try {
synchronized (this) {
- completed(code);
+ completed();
//note whether or not the service had already stopped
LOG.debug("Process has exited with exit code {}", code);
if (code != 0) {
@@ -235,12 +235,11 @@ public class ForkedProcessService
/**
* Note the process as having completed.
- * The exit code is stored, the process marked as terminated
+ * The process marked as terminated
* -and anything synchronized on <code>processTerminated</code>
* is notified
- * @param code exit code
*/
- protected void completed(int code) {
+ protected void completed() {
processTerminated.set(true);
synchronized (processTerminated) {
processTerminated.notify();
@@ -289,12 +288,12 @@ public class ForkedProcessService
*
* @param finalOutput flag to indicate "wait for the final output of the process"
* @param duration the duration, in ms,
- * ro wait for recent output to become non-empty
+ * to wait for recent output to become non-empty
* @return a possibly empty list
*/
public List<String> getRecentOutput(boolean finalOutput, int duration) {
if (process == null) {
- return new LinkedList<String>();
+ return new LinkedList<>();
}
return process.getRecentOutput(finalOutput, duration);
}
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/f6e2e9fc/slider-core/src/main/java/org/apache/slider/server/services/workflow/LongLivedProcess.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/server/services/workflow/LongLivedProcess.java b/slider-core/src/main/java/org/apache/slider/server/services/workflow/LongLivedProcess.java
index cebb035..9bd4d3d 100644
--- a/slider-core/src/main/java/org/apache/slider/server/services/workflow/LongLivedProcess.java
+++ b/slider-core/src/main/java/org/apache/slider/server/services/workflow/LongLivedProcess.java
@@ -82,12 +82,11 @@ public class LongLivedProcess implements Runnable {
private ProcessStreamReader processStreamReader;
//list of recent lines, recorded for extraction into reports
- private final List<String> recentLines = new LinkedList<String>();
+ private final List<String> recentLines = new LinkedList<>();
private int recentLineLimit = RECENT_LINE_LOG_LIMIT;
private LongLivedProcessLifecycleEvent lifecycleCallback;
private final AtomicBoolean finalOutputProcessed = new AtomicBoolean(false);
-
/**
* Log supplied in the constructor for the spawned process -accessible
* to inner classes
@@ -241,8 +240,6 @@ public class LongLivedProcess implements Runnable {
}
return result;
}
-
-
/**
* Stop the process if it is running.
@@ -373,7 +370,7 @@ public class LongLivedProcess implements Runnable {
return new ArrayList<String>(recentLines);
}
- /*
+ /**
* @return whether lines of recent output are empty
*/
public synchronized boolean isRecentOutputEmpty() {
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/f6e2e9fc/slider-core/src/main/java/org/apache/slider/server/services/workflow/ServiceThreadFactory.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/server/services/workflow/ServiceThreadFactory.java b/slider-core/src/main/java/org/apache/slider/server/services/workflow/ServiceThreadFactory.java
index 7d7110e..99a2c28 100644
--- a/slider-core/src/main/java/org/apache/slider/server/services/workflow/ServiceThreadFactory.java
+++ b/slider-core/src/main/java/org/apache/slider/server/services/workflow/ServiceThreadFactory.java
@@ -83,7 +83,9 @@ public class ServiceThreadFactory implements ThreadFactory {
Preconditions.checkArgument(r != null, "null runnable");
String threadName =
String.format(namingFormat, name, counter.getAndIncrement());
- return new Thread(r, threadName);
+ Thread thread = new Thread(r, threadName);
+ thread.setDaemon(daemons);
+ return thread;
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/f6e2e9fc/slider-core/src/main/java/org/apache/slider/server/services/workflow/WorkflowCallbackService.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/server/services/workflow/WorkflowCallbackService.java b/slider-core/src/main/java/org/apache/slider/server/services/workflow/WorkflowCallbackService.java
index fae3a38..74d5623 100644
--- a/slider-core/src/main/java/org/apache/slider/server/services/workflow/WorkflowCallbackService.java
+++ b/slider-core/src/main/java/org/apache/slider/server/services/workflow/WorkflowCallbackService.java
@@ -39,13 +39,13 @@ public class WorkflowCallbackService<V> extends
WorkflowScheduledExecutorService<ScheduledExecutorService> {
protected static final Logger LOG =
LoggerFactory.getLogger(WorkflowCallbackService.class);
- private final Callable<V> callback;
- private final int delay;
- private final ServiceTerminatingCallable<V> command;
/**
* This is the callback
*/
- private Callable<V> callable;
+ private final Callable<V> callback;
+ private final int delay;
+ private final ServiceTerminatingCallable<V> command;
+
private ScheduledFuture<V> scheduledFuture;
/**
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/f6e2e9fc/slider-core/src/main/java/org/apache/slider/server/services/workflow/WorkflowSequenceService.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/server/services/workflow/WorkflowSequenceService.java b/slider-core/src/main/java/org/apache/slider/server/services/workflow/WorkflowSequenceService.java
index e584e63..97f97e8 100644
--- a/slider-core/src/main/java/org/apache/slider/server/services/workflow/WorkflowSequenceService.java
+++ b/slider-core/src/main/java/org/apache/slider/server/services/workflow/WorkflowSequenceService.java
@@ -65,7 +65,7 @@ public class WorkflowSequenceService extends AbstractService implements
/**
* list of services
*/
- private final List<Service> serviceList = new ArrayList<Service>();
+ private final List<Service> serviceList = new ArrayList<>();
/**
* The currently active service.