Merge pull request #51 from wyukawa/kill-rest-api

Kill rest api

README.md

@@ -392,12 +392,20 @@ For this feature, shib should be executed by a user who can execute command `map
 monitor: {
   name: 'yarn',
   host: 'resourcemanager.hostname.local',
-  port: 8088,
-  yarn: '/usr/bin/yarn' // 'yarn' in PATH by default
+  port: 8088
 }
 ```
+In this case, shib kills query with Resource Manager REST API.
 
-For this feature, shib should be executed by a user who can execute command `yarn application -kill APP_ID`.
+If you specify yarn command description, shib kills query with `yarn application -kill APP_ID`.
+```js
+monitor: {
+  name: 'yarn',
+  host: 'resourcemanager.hostname.local',
+  port: 8088,
+  yarn: '/usr/bin/yarn'
+}
+```
 
 ### Huahin Manager (obsolete)
 

lib/shib/engines/yarn/client.js

@@ -109,8 +109,34 @@ YARNClient.prototype.status = function(jobname, callback){
 };
 
 YARNClient.prototype.kill = function(appid, callback){
-  var command = this.yarn + " application -kill " + appid;
-  child_process.exec(command, function(err, stdout, stderr){
-    callback(err);
-  });
+  if(this.yarn) {
+    var command = this.yarn + " application -kill " + appid;
+    child_process.exec(command, function(err, stdout, stderr){
+      callback(err);
+    });
+  } else {
+    var options = {
+      host: this.host,
+      port: this.port,
+      path: "/ws/v1/cluster/apps/" + appid + "/state",
+      method: "PUT",
+      headers: {'Content-Type': 'application/json'}
+    };
+
+    var cb = function(res){
+      // status: 2xx
+      var code = String(res.statusCode);
+      if (!code.match(/^2/)) {
+        callback({message: "YARN REST API returns response code " + res.statusCode});
+        return;
+      }
+    };
+
+    var req = http.request(options, cb)
+    req.write('{"state":"KILLED"}');
+    req.on('error', function(error) {
+      callback(error);
+    });
+    req.end();
+  }
 };

lib/shib/engines/yarn/index.js

@@ -8,9 +8,6 @@ var Monitor = exports.Monitor = function(conf, logger) {
     throw "YARN WebUI host/port not specified";
   }
   var yarn = conf.yarn;
-  if (! conf.yarn) {
-    yarn = 'yarn';
-  }
   this.logger = logger;
   this._client = new YARNClient(conf.host, conf.port, yarn);
 };