From 406d45572ed74d6605c5522fe96e7f1bf30cf84c Mon Sep 17 00:00:00 2001 From: hokiegeek2 Date: Wed, 17 Aug 2016 16:02:16 -0400 Subject: [PATCH 1/2] MYRIAD-239 Fixed issue with * by updating conf files, added doc comments, and added JUnit test case. --- .../apache/myriad/configuration/MyriadConfiguration.java | 2 ++ .../src/main/resources/myriad-config-default.yml | 3 ++- .../myriad/configuration/MyriadConfigurationTest.java | 8 ++++++-- .../src/test/resources/myriad-config-test-default.yml | 3 ++- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/myriad-scheduler/src/main/java/org/apache/myriad/configuration/MyriadConfiguration.java b/myriad-scheduler/src/main/java/org/apache/myriad/configuration/MyriadConfiguration.java index 3de72a6a..f235c490 100644 --- a/myriad-scheduler/src/main/java/org/apache/myriad/configuration/MyriadConfiguration.java +++ b/myriad-scheduler/src/main/java/org/apache/myriad/configuration/MyriadConfiguration.java @@ -212,6 +212,8 @@ public String getFrameworkName() { } public String getFrameworkRole() { + if (frameworkRole.contains("/")) + return frameworkRole.replace("/",""); return frameworkRole; } diff --git a/myriad-scheduler/src/main/resources/myriad-config-default.yml b/myriad-scheduler/src/main/resources/myriad-config-default.yml index f985054e..c89e9f59 100644 --- a/myriad-scheduler/src/main/resources/myriad-config-default.yml +++ b/myriad-scheduler/src/main/resources/myriad-config-default.yml @@ -20,7 +20,8 @@ mesosMaster: 10.0.2.15:5050 checkpoint: false frameworkFailoverTimeout: 43200000 frameworkName: MyriadAlpha -frameworkRole: +# For the mesos * role, must surround with quotes to prevent yaml parsing error +frameworkRole: '*' frameworkUser: hduser # User the Node Manager runs as, required if nodeManagerURI set, otherwise defaults to the user # running the resource manager. frameworkSuperUser: root # To be depricated, currently permissions need set by a superuser due to Mesos-1790. Must be diff --git a/myriad-scheduler/src/test/java/org/apache/myriad/configuration/MyriadConfigurationTest.java b/myriad-scheduler/src/test/java/org/apache/myriad/configuration/MyriadConfigurationTest.java index 85fe5e61..34fb8a99 100644 --- a/myriad-scheduler/src/test/java/org/apache/myriad/configuration/MyriadConfigurationTest.java +++ b/myriad-scheduler/src/test/java/org/apache/myriad/configuration/MyriadConfigurationTest.java @@ -61,5 +61,9 @@ public void additionalPropertiestest() throws Exception { assertEquals(taskName, outTaskname); } } - -} + + @Test + public void testFrameworkRole() throws Exception { + assertEquals("*", cfg.getFrameworkRole()); + } +} \ No newline at end of file diff --git a/myriad-scheduler/src/test/resources/myriad-config-test-default.yml b/myriad-scheduler/src/test/resources/myriad-config-test-default.yml index 241aac99..7a2988e7 100644 --- a/myriad-scheduler/src/test/resources/myriad-config-test-default.yml +++ b/myriad-scheduler/src/test/resources/myriad-config-test-default.yml @@ -19,7 +19,8 @@ mesosMaster: 10.0.2.15:5050 checkpoint: false frameworkFailoverTimeout: 43200000 frameworkName: MyriadTest -frameworkRole: +# For the mesos * role, must surround with quotes to prevent yaml parsing error +frameworkRole: '*' frameworkUser: hduser # User the Node Manager runs as, required if nodeManagerURI set, otherwise defaults to the user # running the resource manager. frameworkSuperUser: root # To be depricated, currently permissions need set by a superuser due to Mesos-1790. Must be From 0eceeffa998fdcba58557eaa8d56ff9eea58b315 Mon Sep 17 00:00:00 2001 From: hokiegeek2 Date: Tue, 23 Aug 2016 13:08:04 -0400 Subject: [PATCH 2/2] MYRIAD-239 fixed formatting issue --- .../org/apache/myriad/configuration/MyriadConfiguration.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/myriad-scheduler/src/main/java/org/apache/myriad/configuration/MyriadConfiguration.java b/myriad-scheduler/src/main/java/org/apache/myriad/configuration/MyriadConfiguration.java index f235c490..3191ab9f 100644 --- a/myriad-scheduler/src/main/java/org/apache/myriad/configuration/MyriadConfiguration.java +++ b/myriad-scheduler/src/main/java/org/apache/myriad/configuration/MyriadConfiguration.java @@ -212,8 +212,9 @@ public String getFrameworkName() { } public String getFrameworkRole() { - if (frameworkRole.contains("/")) - return frameworkRole.replace("/",""); + if (frameworkRole.contains("/")) { + return frameworkRole.replace("/", ""); + } return frameworkRole; }