Merge pull request #5 from trams/develop

Fix History REST API

Author: toidi

tests/test_history_server.py

@@ -77,8 +77,8 @@ def test_task_attempts(self, request_mock):
 
     def test_task_attempt(self, request_mock):
         self.hs.task_attempt('job_2', 'task_3', 'attempt_4')
-        request_mock.assert_called_with('/ws/v1/history/mapreduce/jobs/job_2/tasks/task_3/attempt/attempt_4')
+        request_mock.assert_called_with('/ws/v1/history/mapreduce/jobs/job_2/tasks/task_3/attempts/attempt_4')
 
     def test_task_attempt_counters(self, request_mock):
         self.hs.task_attempt_counters('job_2', 'task_3', 'attempt_4')
-        request_mock.assert_called_with('/ws/v1/history/mapreduce/jobs/job_2/tasks/task_3/attempt/attempt_4/counters')
+        request_mock.assert_called_with('/ws/v1/history/mapreduce/jobs/job_2/tasks/task_3/attempts/attempt_4/counters')

yarn_api_client/__init__.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-__version__ = '0.2.4'
+__version__ = '0.2.5'
 __all__ = ['ApplicationMaster', 'HistoryServer', 'NodeManager',
            'ResourceManager']
 

yarn_api_client/base.py

@@ -38,7 +38,8 @@ def request(self, api_path, **query_args):
         if response.status == OK:
             return self.response_class(response)
         else:
-            msg = 'Response finished with status: %s' % response.status
+            explanation = response.read()
+            msg = 'Response finished with status: %s. Details: %s' % (response.status, explanation)
             raise APIError(msg)
 
     def construct_parameters(self, arguments):

yarn_api_client/history_server.py

@@ -216,7 +216,7 @@ def task_attempt(self, job_id, task_id, attempt_id):
         :returns: API response object with JSON data
         :rtype: :py:class:`yarn_api_client.base.Response`
         """
-        path = '/ws/v1/history/mapreduce/jobs/{jobid}/tasks/{taskid}/attempt/{attemptid}'.format(
+        path = '/ws/v1/history/mapreduce/jobs/{jobid}/tasks/{taskid}/attempts/{attemptid}'.format(
             jobid=job_id, taskid=task_id, attemptid=attempt_id)
 
         return self.request(path)
@@ -232,7 +232,7 @@ def task_attempt_counters(self, job_id, task_id, attempt_id):
         :returns: API response object with JSON data
         :rtype: :py:class:`yarn_api_client.base.Response`
         """
-        path = '/ws/v1/history/mapreduce/jobs/{jobid}/tasks/{taskid}/attempt/{attemptid}/counters'.format(
+        path = '/ws/v1/history/mapreduce/jobs/{jobid}/tasks/{taskid}/attempts/{attemptid}/counters'.format(
             jobid=job_id, taskid=task_id, attemptid=attempt_id)
 
         return self.request(path)