Remove reference to Apache Commons Lang StopWatch and use Guava Stopwatch instead.
This closes #81 on Github. Signed-off-by: Terence Yim <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/incubator-twill/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-twill/commit/1b6b42ca Tree: http://git-wip-us.apache.org/repos/asf/incubator-twill/tree/1b6b42ca Diff: http://git-wip-us.apache.org/repos/asf/incubator-twill/diff/1b6b42ca Branch: refs/heads/site Commit: 1b6b42cae44e33a662d91b121bdd4796e481fe81 Parents: c71f7c5 Author: Henry Saputra <[email protected]> Authored: Wed May 11 14:34:08 2016 -0700 Committer: Terence Yim <[email protected]> Committed: Wed May 11 16:18:59 2016 -0700 ---------------------------------------------------------------------- .../twill/internal/DefaultResourceReport.java | 2 +- .../twill/internal/logging/KafkaAppender.java | 4 ++-- .../apache/twill/yarn/YarnTwillController.java | 19 ++++++++++--------- 3 files changed, 13 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-twill/blob/1b6b42ca/twill-core/src/main/java/org/apache/twill/internal/DefaultResourceReport.java ---------------------------------------------------------------------- diff --git a/twill-core/src/main/java/org/apache/twill/internal/DefaultResourceReport.java b/twill-core/src/main/java/org/apache/twill/internal/DefaultResourceReport.java index 767ee45..08c6900 100644 --- a/twill-core/src/main/java/org/apache/twill/internal/DefaultResourceReport.java +++ b/twill-core/src/main/java/org/apache/twill/internal/DefaultResourceReport.java @@ -57,7 +57,7 @@ public final class DefaultResourceReport implements ResourceReport { for (Map.Entry<String, Collection<TwillRunResources>> entry : resources.entrySet()) { this.usedResources.putAll(entry.getKey(), entry.getValue()); } - this.services = new AtomicReference<List<String>>(services); + this.services = new AtomicReference<>(services); } /** http://git-wip-us.apache.org/repos/asf/incubator-twill/blob/1b6b42ca/twill-core/src/main/java/org/apache/twill/internal/logging/KafkaAppender.java ---------------------------------------------------------------------- diff --git a/twill-core/src/main/java/org/apache/twill/internal/logging/KafkaAppender.java b/twill-core/src/main/java/org/apache/twill/internal/logging/KafkaAppender.java index 1f8d02d..90d7415 100644 --- a/twill-core/src/main/java/org/apache/twill/internal/logging/KafkaAppender.java +++ b/twill-core/src/main/java/org/apache/twill/internal/logging/KafkaAppender.java @@ -87,10 +87,10 @@ public final class KafkaAppender extends AppenderBase<ILoggingEvent> { private ScheduledExecutorService scheduler; public KafkaAppender() { - publisher = new AtomicReference<KafkaPublisher.Preparer>(); + publisher = new AtomicReference<>(); flushTask = createFlushTask(); bufferedSize = new AtomicInteger(); - buffer = new ConcurrentLinkedQueue<String>(); + buffer = new ConcurrentLinkedQueue<>(); } /** http://git-wip-us.apache.org/repos/asf/incubator-twill/blob/1b6b42ca/twill-yarn/src/main/java/org/apache/twill/yarn/YarnTwillController.java ---------------------------------------------------------------------- diff --git a/twill-yarn/src/main/java/org/apache/twill/yarn/YarnTwillController.java b/twill-yarn/src/main/java/org/apache/twill/yarn/YarnTwillController.java index 45b8e0c..3efcda4 100644 --- a/twill-yarn/src/main/java/org/apache/twill/yarn/YarnTwillController.java +++ b/twill-yarn/src/main/java/org/apache/twill/yarn/YarnTwillController.java @@ -17,11 +17,11 @@ */ package org.apache.twill.yarn; +import com.google.common.base.Stopwatch; import com.google.common.base.Throwables; import com.google.common.collect.ImmutableList; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.Uninterruptibles; -import org.apache.commons.lang.time.StopWatch; import org.apache.hadoop.yarn.api.records.ApplicationId; import org.apache.hadoop.yarn.api.records.FinalApplicationStatus; import org.apache.hadoop.yarn.api.records.YarnApplicationState; @@ -101,18 +101,18 @@ final class YarnTwillController extends AbstractTwillController implements Twill LOG.debug("Application {} with id {} submitted", appName, appId); YarnApplicationState state = report.getYarnApplicationState(); - StopWatch stopWatch = new StopWatch(); + Stopwatch stopWatch = new Stopwatch(); stopWatch.start(); - stopWatch.split(); long maxTime = TimeUnit.MILLISECONDS.convert(Constants.APPLICATION_MAX_START_SECONDS, TimeUnit.SECONDS); LOG.debug("Checking yarn application status for {} {}", appName, appId); - while (!hasRun(state) && stopWatch.getSplitTime() < maxTime) { + while (!hasRun(state) && stopWatch.elapsedTime(TimeUnit.MILLISECONDS) < maxTime) { report = processController.getReport(); state = report.getYarnApplicationState(); LOG.debug("Yarn application status for {} {}: {}", appName, appId, state); TimeUnit.SECONDS.sleep(1); - stopWatch.split(); + stopWatch.reset(); + stopWatch.start(); } LOG.info("Yarn application {} {} is in state {}", appName, appId, state); if (state != YarnApplicationState.RUNNING) { @@ -155,18 +155,19 @@ final class YarnTwillController extends AbstractTwillController implements Twill // Poll application status from yarn try { - StopWatch stopWatch = new StopWatch(); + Stopwatch stopWatch = new Stopwatch(); stopWatch.start(); - stopWatch.split(); long maxTime = TimeUnit.MILLISECONDS.convert(Constants.APPLICATION_MAX_STOP_SECONDS, TimeUnit.SECONDS); YarnApplicationReport report = processController.getReport(); FinalApplicationStatus finalStatus = report.getFinalApplicationStatus(); ApplicationId appId = report.getApplicationId(); - while (finalStatus == FinalApplicationStatus.UNDEFINED && stopWatch.getSplitTime() < maxTime) { + while (finalStatus == FinalApplicationStatus.UNDEFINED && + stopWatch.elapsedTime(TimeUnit.MILLISECONDS) < maxTime) { LOG.debug("Yarn application final status for {} {}: {}", appName, appId, finalStatus); TimeUnit.SECONDS.sleep(1); - stopWatch.split(); + stopWatch.reset(); + stopWatch.start(); finalStatus = processController.getReport().getFinalApplicationStatus(); } LOG.debug("Yarn application {} {} completed with status {}", appName, appId, finalStatus);
