xcute: Allow to put on hold if lock is already used

oio/cli/admin/xcute/__init__.py

@@ -37,6 +37,15 @@ class XcuteRdirCommand(XcuteCommand, ShowOne):
     def get_parser(self, prog_name):
         parser = super(XcuteRdirCommand, self).get_parser(prog_name)
 
+        parser.add_argument(
+            '--put-on-hold-if-locked',
+            default=False,
+            help="""
+                If the lock is already used,
+                put the job on hold until the lock is released.
+                """,
+            action='store_true')
+
         parser.add_argument(
             '--rdir-fetch-limit', type=int,
             help='Maximum number of entries returned in each rdir response. '
@@ -57,6 +66,7 @@ def take_action(self, parsed_args):
 
         job_config = self.get_job_config(parsed_args)
         job_info = self.xcute.job_create(
-            self.JOB_CLASS.JOB_TYPE, job_config=job_config)
+            self.JOB_CLASS.JOB_TYPE, job_config=job_config,
+            put_on_hold_if_locked=parsed_args.put_on_hold_if_locked)
         return zip(*sorted(
             flat_dict_from_dict(parsed_args, job_info).items()))

oio/cli/admin/xcute/job.py

@@ -90,8 +90,13 @@ def _take_action(self, parsed_args):
         for job_info in jobs:
             job_main_info = job_info['job']
             job_tasks = job_info['tasks']
-            progress = \
-                job_tasks['processed'] * 100. / (job_tasks['total'] or 0.00001)
+            try:
+                progress = job_tasks['processed'] * 100. / job_tasks['total']
+            except ZeroDivisionError:
+                if job_tasks['is_total_temp']:
+                    progress = 0.
+                else:
+                    progress = 100.
             yield (job_main_info['id'], job_main_info['status'],
                    job_main_info['type'], job_main_info.get('lock'),
                    '%.2f%%' % progress)
@@ -130,12 +135,25 @@ def take_action(self, parsed_args):
             job_main_info['duration'] = duration
 
             job_tasks = job_info['tasks']
-            job_tasks['sent_percent'] = \
-                job_tasks['sent'] * 100. / (job_tasks['total'] or 0.00001)
+            try:
+                sent_percent = job_tasks['sent'] * 100. / job_tasks['total']
+            except ZeroDivisionError:
+                if job_tasks['is_total_temp']:
+                    sent_percent = 0.
+                else:
+                    sent_percent = 100.
+            job_tasks['sent_percent'] = sent_percent
             job_tasks['processed_per_second'] = \
                 job_tasks['processed'] / (duration or 0.00001)
-            job_tasks['processed_percent'] = \
-                job_tasks['processed'] * 100. / (job_tasks['total'] or 0.00001)
+            try:
+                processed_percent = \
+                    job_tasks['processed'] * 100. / job_tasks['total']
+            except ZeroDivisionError:
+                if job_tasks['is_total_temp']:
+                    processed_percent = 0.
+                else:
+                    processed_percent = 100.
+            job_tasks['processed_percent'] = processed_percent
 
             if parsed_args.formatter == 'table':
                 if not job_tasks['all_sent']:

oio/xcute/client.py

@@ -112,9 +112,13 @@ def job_list(self, limit=None, prefix=None, marker=None,
                                         'lock': job_lock})
         return data
 
-    def job_create(self, job_type, job_config=None):
+    def job_create(self, job_type, job_config=None,
+                   put_on_hold_if_locked=False):
         _, data = self.xcute_request(
-            'POST', '/job/create', params={'type': job_type}, json=job_config)
+            'POST', '/job/create',
+            params={'type': job_type,
+                    'put_on_hold_if_locked': put_on_hold_if_locked},
+            json=job_config)
         return data
 
     def job_show(self, job_id):