Mass rename of shard -> split

awx/main/models/inventory.py

@@ -221,14 +221,14 @@ class Inventory(CommonModelNameNotUnique, ResourceMixin, RelatedJobsMixin):
         return group_children_map
 
     @staticmethod
-    def parse_shard_params(shard_str):
-        m = re.match(r"shard(?P<offset>\d+)of(?P<step>\d+)", shard_str)
+    def parse_split_params(split_str):
+        m = re.match(r"split(?P<offset>\d+)of(?P<step>\d+)", split_str)
         if not m:
-            raise ParseError(_('Could not parse subset as shard specification.'))
+            raise ParseError(_('Could not parse subset as split specification.'))
         offset = int(m.group('offset'))
         step = int(m.group('step'))
         if offset > step:
-            raise ParseError(_('Shard offset must be greater than total number of shards.'))
+            raise ParseError(_('Split offset must be greater than total number of splits.'))
         return (offset, step)
 
     def get_script_data(self, hostvars=False, towervars=False, show_all=False, subset=None):
@@ -242,8 +242,8 @@ class Inventory(CommonModelNameNotUnique, ResourceMixin, RelatedJobsMixin):
         if subset:
             if not isinstance(subset, six.string_types):
                 raise ParseError(_('Inventory subset argument must be a string.'))
-            if subset.startswith('shard'):
-                offset, step = Inventory.parse_shard_params(subset)
+            if subset.startswith('split'):
+                offset, step = Inventory.parse_split_params(subset)
                 hosts = hosts[offset::step]
             else:
                 raise ParseError(_('Subset does not use any supported syntax.'))

awx/main/models/jobs.py

@@ -277,7 +277,7 @@ class JobTemplate(UnifiedJobTemplate, JobOptions, SurveyJobTemplateMixin, Resour
         default=False,
         allows_field='credentials'
     )
-    job_shard_count = models.IntegerField(
+    job_split_count = models.IntegerField(
         blank=True,
         default=0,
         help_text=_("The number of jobs to split into at runtime. "
@@ -328,10 +328,10 @@ class JobTemplate(UnifiedJobTemplate, JobOptions, SurveyJobTemplateMixin, Resour
         return self.create_unified_job(**kwargs)
 
     def create_unified_job(self, **kwargs):
-        prevent_sharding = kwargs.pop('_prevent_sharding', False)
-        split_event = bool(self.job_shard_count > 1 and (not prevent_sharding))
+        prevent_splitting = kwargs.pop('_prevent_splitting', False)
+        split_event = bool(self.job_split_count > 1 and (not prevent_splitting))
         if split_event:
-            # A sharded Job Template will generate a WorkflowJob rather than a Job
+            # A Split Job Template will generate a WorkflowJob rather than a Job
             from awx.main.models.workflow import WorkflowJobTemplate, WorkflowJobNode
             kwargs['_unified_job_class'] = WorkflowJobTemplate._get_unified_job_class()
             kwargs['_parent_field_name'] = "job_template"
@@ -342,11 +342,11 @@ class JobTemplate(UnifiedJobTemplate, JobOptions, SurveyJobTemplateMixin, Resour
             except JobLaunchConfig.DoesNotExist:
                 wj_config = JobLaunchConfig()
             actual_inventory = wj_config.inventory if wj_config.inventory else self.inventory
-            for idx in xrange(min(self.job_shard_count,
+            for idx in xrange(min(self.job_split_count,
                                   actual_inventory.hosts.count())):
                 create_kwargs = dict(workflow_job=job,
                                      unified_job_template=self,
-                                     ancestor_artifacts=dict(job_shard=idx))
+                                     ancestor_artifacts=dict(job_split=idx))
                 WorkflowJobNode.objects.create(**create_kwargs)
         return job
 
@@ -580,7 +580,7 @@ class Job(UnifiedJob, JobOptions, SurveyJobMixin, JobNotificationMixin, TaskMana
         return JobEvent
 
     def copy_unified_job(self, **new_prompts):
-        new_prompts['_prevent_sharding'] = True
+        new_prompts['_prevent_splitting'] = True
         if self.internal_limit:
             new_prompts.setdefault('_eager_fields', {})
             new_prompts['_eager_fields']['internal_limit'] = self.internal_limit  # oddball, not from JT or prompts

awx/main/models/unified_jobs.py

@@ -334,7 +334,7 @@ class UnifiedJobTemplate(PolymorphicModel, CommonModelNameNotUnique, Notificatio
         parent_field_name = None
         if "_unified_job_class" in kwargs:
             # Special case where spawned job is different type than usual
-            # Only used for sharded jobs
+            # Only used for split jobs
             unified_job_class = kwargs.pop("_unified_job_class")
             fields = unified_job_class._get_unified_job_field_names() & fields
             parent_field_name = kwargs.pop('_parent_field_name')
@@ -354,7 +354,7 @@ class UnifiedJobTemplate(PolymorphicModel, CommonModelNameNotUnique, Notificatio
             for fd, val in eager_fields.items():
                 setattr(unified_job, fd, val)
 
-        # NOTE: sharded workflow jobs _get_parent_field_name method
+        # NOTE: split workflow jobs _get_parent_field_name method
         # is not correct until this is set
         if not parent_field_name:
             parent_field_name = unified_job._get_parent_field_name()

awx/main/models/workflow.py

@@ -251,19 +251,19 @@ class WorkflowJobNode(WorkflowNodeBase):
             data['extra_vars'] = extra_vars
         # ensure that unified jobs created by WorkflowJobs are marked
         data['_eager_fields'] = {'launch_type': 'workflow'}
-        # Extra processing in the case that this is a sharded job
-        if 'job_shard' in self.ancestor_artifacts:
-            shard_str = six.text_type(self.ancestor_artifacts['job_shard'] + 1)
+        # Extra processing in the case that this is a split job
+        if 'job_split' in self.ancestor_artifacts:
+            split_str = six.text_type(self.ancestor_artifacts['job_split'] + 1)
             data['_eager_fields']['name'] = six.text_type("{} - {}").format(
-                self.unified_job_template.name[:512 - len(shard_str) - len(' - ')],
-                shard_str
+                self.unified_job_template.name[:512 - len(split_str) - len(' - ')],
+                split_str
             )
             data['_eager_fields']['allow_simultaneous'] = True
-            data['_eager_fields']['internal_limit'] = 'shard{0}of{1}'.format(
-                self.ancestor_artifacts['job_shard'],
+            data['_eager_fields']['internal_limit'] = 'split{0}of{1}'.format(
+                self.ancestor_artifacts['job_split'],
                 self.workflow_job.workflow_job_nodes.count()
             )
-            data['_prevent_sharding'] = True
+            data['_prevent_splitting'] = True
         return data
 
 
@@ -459,7 +459,7 @@ class WorkflowJob(UnifiedJob, WorkflowJobOptions, SurveyJobMixin, JobNotificatio
     )
     job_template = models.ForeignKey(
         'JobTemplate',
-        related_name='sharded_jobs',
+        related_name='split_jobs',
         blank=True,
         null=True,
         default=None,
@@ -472,7 +472,7 @@ class WorkflowJob(UnifiedJob, WorkflowJobOptions, SurveyJobMixin, JobNotificatio
 
     def _get_parent_field_name(self):
         if self.job_template_id:
-            # This is a workflow job which is a container for sharded jobs
+            # This is a workflow job which is a container for split jobs
             return 'job_template'
         return 'workflow_job_template'