Remove code left for backwards compatibility

dmwm · Feb 21, 2019 · 8e967b4 · 8e967b4
1 parent 06a5e89
commit 8e967b4
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 11 deletions.
diff --git a/src/python/WMCore/ReqMgr/DataStructs/DefaultConfig/EDITABLE_SPLITTING_PARAM_CONFIG.py b/src/python/WMCore/ReqMgr/DataStructs/DefaultConfig/EDITABLE_SPLITTING_PARAM_CONFIG.py
@@ -6,7 +6,6 @@
              "LumiBased": {"lumis_per_job": '',
                            "halt_job_on_file_boundaries": True},
              "EventAwareLumiBased": {"events_per_job": '',
-                                     "max_events_per_lumi": '',  # has to be removed in ~HG1804
                                      "job_time_limit": '',
                                      "halt_job_on_file_boundaries": True},
              "EventBased": {"events_per_job": '',

diff --git a/src/python/WMCore/WMRuntime/Watchdog.py b/src/python/WMCore/WMRuntime/Watchdog.py
@@ -88,12 +88,8 @@ def setupMonitors(self, task, wmbsJob):
                     origCores = max(origCores, sh.getNumberOfCores())
                 resources = {'cores': origCores}
                 origMaxRSS = args.get('maxRSS')
-                ### TODO: keep only the else clause after ~HG1805
-                if origMaxRSS and origMaxRSS > 100 * 1000:  # in case MaxRSS is in KB
-                    origMaxRSS = int(origMaxRSS / 1024.)  # HTCondor expects MB; we get KB.
+                if origMaxRSS:
                     resources['memory'] = origMaxRSS
-                elif origMaxRSS:
-                    resources['memory'] = origMaxRSS  # then it's already in MB
                 # Actually parses the HTCondor runtime
                 resizeResources(resources)
                 # We decided to only touch Watchdog settings if the number of cores changed.

diff --git a/src/python/WMCore/WMSpec/WMTask.py b/src/python/WMCore/WMSpec/WMTask.py
@@ -1029,11 +1029,7 @@ def getSubscriptionInformation(self):
         if not hasattr(self.data, "subscriptions"):
             return {}
 
-        # FIXME making it backwards compatible.
-        # New key is 'outputSubs', remove the outputModule handle around HG1710
-        subKeyName = 'outputModules'
-        if hasattr(self.data.subscriptions, 'outputSubs'):
-            subKeyName = 'outputSubs'
+        subKeyName = 'outputSubs'
 
         subInformation = {}
         for outputSub in getattr(self.data.subscriptions, subKeyName):