Repository: incubator-slider Updated Branches: refs/heads/develop cdf9e5807 -> 8b36b056b
SLIDER-563 Ensure default log aggregation settings are valid for all default app packages Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/8b36b056 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/8b36b056 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/8b36b056 Branch: refs/heads/develop Commit: 8b36b056bebc0c2674dda8ca5944f52b32c72c42 Parents: cdf9e58 Author: Gour Saha <[email protected]> Authored: Thu Oct 23 21:10:49 2014 -0700 Committer: Gour Saha <[email protected]> Committed: Thu Oct 23 21:12:47 2014 -0700 ---------------------------------------------------------------------- app-packages/accumulo/resources-default.json | 3 +-- app-packages/accumulo/src/test/resources/resources.json | 3 +-- app-packages/hbase-win/resources-default.json | 3 +-- app-packages/hbase/resources-default.json | 3 +-- app-packages/hbase/src/test/resources/resources-default.json | 3 +-- app-packages/storm-win/resources-default.json | 3 +-- app-packages/storm/resources-default.json | 3 +-- .../src/main/java/org/apache/slider/api/ResourceKeys.java | 4 +++- .../java/org/apache/slider/core/launch/AbstractLauncher.java | 4 ---- .../org/apache/slider/core/launch/TestAppMasterLauncher.java | 8 -------- 10 files changed, 10 insertions(+), 27 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/8b36b056/app-packages/accumulo/resources-default.json ---------------------------------------------------------------------- diff --git a/app-packages/accumulo/resources-default.json b/app-packages/accumulo/resources-default.json index 48bc772..f0923f2 100644 --- a/app-packages/accumulo/resources-default.json +++ b/app-packages/accumulo/resources-default.json @@ -4,8 +4,7 @@ }, "global": { "yarn.log.include.patterns": "", - "yarn.log.exclude.patterns": "", - "yarn.log.interval": "60" + "yarn.log.exclude.patterns": "" }, "components": { "ACCUMULO_MASTER": { http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/8b36b056/app-packages/accumulo/src/test/resources/resources.json ---------------------------------------------------------------------- diff --git a/app-packages/accumulo/src/test/resources/resources.json b/app-packages/accumulo/src/test/resources/resources.json index cfd9b3f..1c5dd97 100644 --- a/app-packages/accumulo/src/test/resources/resources.json +++ b/app-packages/accumulo/src/test/resources/resources.json @@ -4,8 +4,7 @@ }, "global": { "yarn.log.include.patterns": "", - "yarn.log.exclude.patterns": "", - "yarn.log.interval": "0" + "yarn.log.exclude.patterns": "" }, "components": { "ACCUMULO_MASTER": { http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/8b36b056/app-packages/hbase-win/resources-default.json ---------------------------------------------------------------------- diff --git a/app-packages/hbase-win/resources-default.json b/app-packages/hbase-win/resources-default.json index eb38726..4fedf01 100644 --- a/app-packages/hbase-win/resources-default.json +++ b/app-packages/hbase-win/resources-default.json @@ -4,8 +4,7 @@ }, "global": { "yarn.log.include.patterns": "", - "yarn.log.exclude.patterns": "", - "yarn.log.interval": "0" + "yarn.log.exclude.patterns": "" }, "components": { "HBASE_MASTER": { http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/8b36b056/app-packages/hbase/resources-default.json ---------------------------------------------------------------------- diff --git a/app-packages/hbase/resources-default.json b/app-packages/hbase/resources-default.json index 2487e14..c467f1b 100644 --- a/app-packages/hbase/resources-default.json +++ b/app-packages/hbase/resources-default.json @@ -4,8 +4,7 @@ }, "global": { "yarn.log.include.patterns": "", - "yarn.log.exclude.patterns": "", - "yarn.log.interval": "0" + "yarn.log.exclude.patterns": "" }, "components": { "HBASE_MASTER": { http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/8b36b056/app-packages/hbase/src/test/resources/resources-default.json ---------------------------------------------------------------------- diff --git a/app-packages/hbase/src/test/resources/resources-default.json b/app-packages/hbase/src/test/resources/resources-default.json index eb38726..4fedf01 100644 --- a/app-packages/hbase/src/test/resources/resources-default.json +++ b/app-packages/hbase/src/test/resources/resources-default.json @@ -4,8 +4,7 @@ }, "global": { "yarn.log.include.patterns": "", - "yarn.log.exclude.patterns": "", - "yarn.log.interval": "0" + "yarn.log.exclude.patterns": "" }, "components": { "HBASE_MASTER": { http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/8b36b056/app-packages/storm-win/resources-default.json ---------------------------------------------------------------------- diff --git a/app-packages/storm-win/resources-default.json b/app-packages/storm-win/resources-default.json index 31b445e..a36f005 100644 --- a/app-packages/storm-win/resources-default.json +++ b/app-packages/storm-win/resources-default.json @@ -4,8 +4,7 @@ }, "global" : { "yarn.log.include.patterns": "", - "yarn.log.exclude.patterns": "", - "yarn.log.interval": "0" + "yarn.log.exclude.patterns": "" }, "components": { "slider-appmaster": { http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/8b36b056/app-packages/storm/resources-default.json ---------------------------------------------------------------------- diff --git a/app-packages/storm/resources-default.json b/app-packages/storm/resources-default.json index 31b445e..a36f005 100644 --- a/app-packages/storm/resources-default.json +++ b/app-packages/storm/resources-default.json @@ -4,8 +4,7 @@ }, "global" : { "yarn.log.include.patterns": "", - "yarn.log.exclude.patterns": "", - "yarn.log.interval": "0" + "yarn.log.exclude.patterns": "" }, "components": { "slider-appmaster": { http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/8b36b056/slider-core/src/main/java/org/apache/slider/api/ResourceKeys.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/api/ResourceKeys.java b/slider-core/src/main/java/org/apache/slider/api/ResourceKeys.java index f2b9d76..538189a 100644 --- a/slider-core/src/main/java/org/apache/slider/api/ResourceKeys.java +++ b/slider-core/src/main/java/org/apache/slider/api/ResourceKeys.java @@ -129,7 +129,9 @@ public interface ResourceKeys { */ int DEFAULT_CONTAINER_FAILURE_THRESHOLD = 5; + /** + * Log aggregation include, exclude patterns + */ String YARN_LOG_INCLUDE_PATTERNS = "yarn.log.include.patterns"; String YARN_LOG_EXCLUDE_PATTERNS = "yarn.log.exclude.patterns"; - String YARN_LOG_INTERVAL = "yarn.log.interval"; } http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/8b36b056/slider-core/src/main/java/org/apache/slider/core/launch/AbstractLauncher.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/core/launch/AbstractLauncher.java b/slider-core/src/main/java/org/apache/slider/core/launch/AbstractLauncher.java index 0694438..94f8f24 100644 --- a/slider-core/src/main/java/org/apache/slider/core/launch/AbstractLauncher.java +++ b/slider-core/src/main/java/org/apache/slider/core/launch/AbstractLauncher.java @@ -307,12 +307,8 @@ public abstract class AbstractLauncher extends Configured { logPatternJoinStr); log.info("Log exclude patterns: {}", logExcludePattern); - long logInterval = options - .getOptionInt(ResourceKeys.YARN_LOG_INTERVAL, 0); - log.info("Log interval: {}", logInterval); logAggregationContext = LogAggregationContext.newInstance( logIncludePattern, logExcludePattern); - // log interval has been removed from signature - fix required } } http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/8b36b056/slider-core/src/test/java/org/apache/slider/core/launch/TestAppMasterLauncher.java ---------------------------------------------------------------------- diff --git a/slider-core/src/test/java/org/apache/slider/core/launch/TestAppMasterLauncher.java b/slider-core/src/test/java/org/apache/slider/core/launch/TestAppMasterLauncher.java index f4fe53d..1267098 100644 --- a/slider-core/src/test/java/org/apache/slider/core/launch/TestAppMasterLauncher.java +++ b/slider-core/src/test/java/org/apache/slider/core/launch/TestAppMasterLauncher.java @@ -58,7 +58,6 @@ public class TestAppMasterLauncher { " | slider*.txt |agent.out| |"); options.put(ResourceKeys.YARN_LOG_EXCLUDE_PATTERNS, "command*.json| agent.log* | "); - options.put(ResourceKeys.YARN_LOG_INTERVAL, "30"); EasyMock.replay(mockYarnClient, appSubmissionContext, yarnClientApp); AppMasterLauncher appMasterLauncher = new AppMasterLauncher("cl1", @@ -74,9 +73,6 @@ public class TestAppMasterLauncher { Assert.assertEquals(expectedExclude, appMasterLauncher.logAggregationContext.getExcludePattern()); -// Assert.assertEquals(30, -// appMasterLauncher.logAggregationContext.getRollingIntervalSeconds()); - EasyMock.verify(mockYarnClient, appSubmissionContext, yarnClientApp); } @@ -87,7 +83,6 @@ public class TestAppMasterLauncher { options.put(ResourceKeys.YARN_LOG_INCLUDE_PATTERNS, " "); options.put(ResourceKeys.YARN_LOG_EXCLUDE_PATTERNS, "command*.json| agent.log* | "); - options.put(ResourceKeys.YARN_LOG_INTERVAL, "600"); EasyMock.replay(mockYarnClient, appSubmissionContext, yarnClientApp); AppMasterLauncher appMasterLauncher = new AppMasterLauncher("cl1", @@ -103,9 +98,6 @@ public class TestAppMasterLauncher { Assert.assertEquals(expectedExclude, appMasterLauncher.logAggregationContext.getExcludePattern()); -// Assert.assertEquals(600, -// appMasterLauncher.logAggregationContext.getRollingIntervalSeconds()); - EasyMock.verify(mockYarnClient, appSubmissionContext, yarnClientApp); }
