Преглед на файлове

[desktop] Fix detecting YARN resourcemanager failover

The resourcemanager failover was supposedly fixed in 822afd, but
unfortunately it looks like a rebase accidentally preserved the
old non-working behavior. This patch actually causes the failover
to be detected and properly handled.
Erick Tryzelaar преди 10 години
родител
ревизия
20a6d2c0c7
променени са 1 файла, в които са добавени 0 реда и са изтрити 4 реда
  1. 0 4
      desktop/libs/hadoop/src/hadoop/yarn/resource_manager_api.py

+ 0 - 4
desktop/libs/hadoop/src/hadoop/yarn/resource_manager_api.py

@@ -83,19 +83,15 @@ class ResourceManagerApi(object):
     return self._security_enabled
 
   def cluster(self, **kwargs):
-    return self._root.get('cluster', params=kwargs, headers={'Accept': _JSON_CONTENT_TYPE})
     return self._execute(self._root.get, 'cluster', params=kwargs, headers={'Accept': _JSON_CONTENT_TYPE})
 
   def apps(self, **kwargs):
-    return self._root.get('cluster/apps', params=kwargs, headers={'Accept': _JSON_CONTENT_TYPE})
     return self._execute(self._root.get, 'cluster/apps', params=kwargs, headers={'Accept': _JSON_CONTENT_TYPE})
 
   def app(self, app_id):
-    return self._root.get('cluster/apps/%(app_id)s' % {'app_id': app_id}, headers={'Accept': _JSON_CONTENT_TYPE})
     return self._execute(self._root.get, 'cluster/apps/%(app_id)s' % {'app_id': app_id}, headers={'Accept': _JSON_CONTENT_TYPE})
 
   def kill(self, app_id):
-    return self._root.put('cluster/apps/%(app_id)s/state' % {'app_id': app_id}, data=json.dumps({'state': 'KILLED'}), contenttype=_JSON_CONTENT_TYPE)
     return self._execute(self._root.put, 'cluster/apps/%(app_id)s/state' % {'app_id': app_id}, data=json.dumps({'state': 'KILLED'}), contenttype=_JSON_CONTENT_TYPE)
 
   def _execute(self, function, *args, **kwargs):