[1/2] incubator-myriad git commit: Couple of minor bug fixes for 0.2.0 RC: 1. UI frameworkShutdown is broken because of PR#58. 2. Additional 'sudo' from cgroup cmdline. 3. Adding profile info to flexd

2016-05-17 Thread darinj 
Repository: incubator-myriad
Updated Branches:
  refs/heads/0.2.x 6c11c7338 -> 700dd44ac


Couple of minor bug fixes for 0.2.0 RC:
1. UI frameworkShutdown is broken because of PR#58.
2. Additional 'sudo' from cgroup cmdline.
3. Adding profile info to flexdown UI (keep same with flexup).
Pull Request:
  Closes #74
Author: sarjeet2013


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

Branch: refs/heads/0.2.x
Commit: 553110336d05111e0dc8be3952881abdf81ba8b8
Parents: 6c11c73
Author: Sarjeet Singh 
Authored: Mon May 16 01:41:16 2016 -0700
Committer: darinj 
Committed: Tue May 17 17:00:07 2016 -0400

--
 .../main/java/org/apache/myriad/scheduler/NMExecutorCLGenImpl.java | 1 -
 .../src/main/resources/webapp/js/components/FlexDownComponent.js   | 2 +-
 .../resources/webapp/js/components/ShutdownFrameworkComponent.js   | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-myriad/blob/55311033/myriad-scheduler/src/main/java/org/apache/myriad/scheduler/NMExecutorCLGenImpl.java
--
diff --git 
a/myriad-scheduler/src/main/java/org/apache/myriad/scheduler/NMExecutorCLGenImpl.java
 
b/myriad-scheduler/src/main/java/org/apache/myriad/scheduler/NMExecutorCLGenImpl.java
index 2700488..8fca9e2 100644
--- 
a/myriad-scheduler/src/main/java/org/apache/myriad/scheduler/NMExecutorCLGenImpl.java
+++ 
b/myriad-scheduler/src/main/java/org/apache/myriad/scheduler/NMExecutorCLGenImpl.java
@@ -110,7 +110,6 @@ public class NMExecutorCLGenImpl implements 
ExecutorCommandLineGenerator {
   protected void appendCgroupsCmds(StringBuilder cmdLine) {
 if (cfg.getFrameworkSuperUser().isPresent()) {
   cmdLine.append(" export TASK_DIR=`basename $PWD`&&");
-  appendSudo(cmdLine);
   //The container executor script expects mount-path to exist and owned by 
the yarn user
   //See: 
https://hadoop.apache.org/docs/stable/hadoop-yarn/hadoop-yarn-site/NodeManagerCgroups.html
   //If YARN ever moves to cgroup/mem it will be necessary to add a mem 
version.

http://git-wip-us.apache.org/repos/asf/incubator-myriad/blob/55311033/myriad-scheduler/src/main/resources/webapp/js/components/FlexDownComponent.js
--
diff --git 
a/myriad-scheduler/src/main/resources/webapp/js/components/FlexDownComponent.js 
b/myriad-scheduler/src/main/resources/webapp/js/components/FlexDownComponent.js
index 0a44195..1ea5218 100644
--- 
a/myriad-scheduler/src/main/resources/webapp/js/components/FlexDownComponent.js
+++ 
b/myriad-scheduler/src/main/resources/webapp/js/components/FlexDownComponent.js
@@ -114,7 +114,7 @@ var FlexDownComponent = React.createClass({
}
for( var ii = 0; ii < keys.length; ii++) {
var key = keys[ii];
-   var txt = key;
+   var txt = key + '\t' + JSON.stringify(this.props.profiles[key]);
options.push( {txt} );
}
 

http://git-wip-us.apache.org/repos/asf/incubator-myriad/blob/55311033/myriad-scheduler/src/main/resources/webapp/js/components/ShutdownFrameworkComponent.js
--
diff --git 
a/myriad-scheduler/src/main/resources/webapp/js/components/ShutdownFrameworkComponent.js
 
b/myriad-scheduler/src/main/resources/webapp/js/components/ShutdownFrameworkComponent.js
index a26f070..689b4e4 100644
--- 
a/myriad-scheduler/src/main/resources/webapp/js/components/ShutdownFrameworkComponent.js
+++ 
b/myriad-scheduler/src/main/resources/webapp/js/components/ShutdownFrameworkComponent.js
@@ -81,7 +81,7 @@ var ShutdownFrameworkComponent = React.createClass({
},
onRequestShutdown: function() {
console.log( "shutting down Myriad  ");
-   request.get('/api/framework/shutdown/framework')
+   request.post('/api/framework/shutdown/framework')
.set('Content-Type', 'application/json')
.end(function(err, res){
console.log("Result from 
/api/framework/shutdown/framework");

[1/2] incubator-myriad git commit: Couple of minor bug fixes for 0.2.0 RC: 1. UI frameworkShutdown is broken because of PR#58. 2. Additional 'sudo' from cgroup cmdline. 3. Adding profile info to flexd

2016-05-17 Thread darinj 
Repository: incubator-myriad
Updated Branches:
  refs/heads/master 6c11c7338 -> 700dd44ac


Couple of minor bug fixes for 0.2.0 RC:
1. UI frameworkShutdown is broken because of PR#58.
2. Additional 'sudo' from cgroup cmdline.
3. Adding profile info to flexdown UI (keep same with flexup).
Pull Request:
  Closes #74
Author: sarjeet2013


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

Branch: refs/heads/master
Commit: 553110336d05111e0dc8be3952881abdf81ba8b8
Parents: 6c11c73
Author: Sarjeet Singh 
Authored: Mon May 16 01:41:16 2016 -0700
Committer: darinj 
Committed: Tue May 17 17:00:07 2016 -0400

--
 .../main/java/org/apache/myriad/scheduler/NMExecutorCLGenImpl.java | 1 -
 .../src/main/resources/webapp/js/components/FlexDownComponent.js   | 2 +-
 .../resources/webapp/js/components/ShutdownFrameworkComponent.js   | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-myriad/blob/55311033/myriad-scheduler/src/main/java/org/apache/myriad/scheduler/NMExecutorCLGenImpl.java
--
diff --git 
a/myriad-scheduler/src/main/java/org/apache/myriad/scheduler/NMExecutorCLGenImpl.java
 
b/myriad-scheduler/src/main/java/org/apache/myriad/scheduler/NMExecutorCLGenImpl.java
index 2700488..8fca9e2 100644
--- 
a/myriad-scheduler/src/main/java/org/apache/myriad/scheduler/NMExecutorCLGenImpl.java
+++ 
b/myriad-scheduler/src/main/java/org/apache/myriad/scheduler/NMExecutorCLGenImpl.java
@@ -110,7 +110,6 @@ public class NMExecutorCLGenImpl implements 
ExecutorCommandLineGenerator {
   protected void appendCgroupsCmds(StringBuilder cmdLine) {
 if (cfg.getFrameworkSuperUser().isPresent()) {
   cmdLine.append(" export TASK_DIR=`basename $PWD`&&");
-  appendSudo(cmdLine);
   //The container executor script expects mount-path to exist and owned by 
the yarn user
   //See: 
https://hadoop.apache.org/docs/stable/hadoop-yarn/hadoop-yarn-site/NodeManagerCgroups.html
   //If YARN ever moves to cgroup/mem it will be necessary to add a mem 
version.

http://git-wip-us.apache.org/repos/asf/incubator-myriad/blob/55311033/myriad-scheduler/src/main/resources/webapp/js/components/FlexDownComponent.js
--
diff --git 
a/myriad-scheduler/src/main/resources/webapp/js/components/FlexDownComponent.js 
b/myriad-scheduler/src/main/resources/webapp/js/components/FlexDownComponent.js
index 0a44195..1ea5218 100644
--- 
a/myriad-scheduler/src/main/resources/webapp/js/components/FlexDownComponent.js
+++ 
b/myriad-scheduler/src/main/resources/webapp/js/components/FlexDownComponent.js
@@ -114,7 +114,7 @@ var FlexDownComponent = React.createClass({
}
for( var ii = 0; ii < keys.length; ii++) {
var key = keys[ii];
-   var txt = key;
+   var txt = key + '\t' + JSON.stringify(this.props.profiles[key]);
options.push( {txt} );
}
 

http://git-wip-us.apache.org/repos/asf/incubator-myriad/blob/55311033/myriad-scheduler/src/main/resources/webapp/js/components/ShutdownFrameworkComponent.js
--
diff --git 
a/myriad-scheduler/src/main/resources/webapp/js/components/ShutdownFrameworkComponent.js
 
b/myriad-scheduler/src/main/resources/webapp/js/components/ShutdownFrameworkComponent.js
index a26f070..689b4e4 100644
--- 
a/myriad-scheduler/src/main/resources/webapp/js/components/ShutdownFrameworkComponent.js
+++ 
b/myriad-scheduler/src/main/resources/webapp/js/components/ShutdownFrameworkComponent.js
@@ -81,7 +81,7 @@ var ShutdownFrameworkComponent = React.createClass({
},
onRequestShutdown: function() {
console.log( "shutting down Myriad  ");
-   request.get('/api/framework/shutdown/framework')
+   request.post('/api/framework/shutdown/framework')
.set('Content-Type', 'application/json')
.end(function(err, res){
console.log("Result from 
/api/framework/shutdown/framework");