Merge branch 'master' of https://github.com/dmwm/WMCore into update_r…

…equest_splitting
spigad · Sep 12, 2013 · e489744 · e489744
2 parents 59b46fb + 096c7ae
commit e489744
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 5 deletions.
diff --git a/src/python/WMComponent/PhEDExInjector/PhEDExInjectorPoller.py b/src/python/WMComponent/PhEDExInjector/PhEDExInjectorPoller.py
@@ -8,6 +8,7 @@
 import threading
 import logging
 import traceback
+from httplib import HTTPException
 
 from WMCore.WorkerThreads.BaseWorkerThread import BaseWorkerThread
 

diff --git a/test/data/ReqMgr/requests/MonteCarlo.json b/test/data/ReqMgr/requests/MonteCarlo.json
@@ -17,7 +17,7 @@
 		"Group": "DATAOPS",
         "TotalTime": 14400, 
         "TimePerEvent": 40,
-		"Memory": 2394,
+		"Memory": 2000,
 		"SizePerEvent": 512,
 		"SplittingAlgo" : "EventBased",
         "EventsPerJob" : 1400

diff --git a/test/data/ReqMgr/requests/MonteCarloFromGEN.json b/test/data/ReqMgr/requests/MonteCarloFromGEN.json
@@ -15,7 +15,7 @@
 		"Group": "DATAOPS",
 		"TotalTime": 28800,
 		"TimePerEvent": 12,
-        "Memory": 2394,
+        "Memory": 2000,
         "SizePerEvent": 512,
         "InputDataset": "InputDataset-OVERRIDE-ME",
         "RunWhitelist": [],

diff --git a/test/data/ReqMgr/requests/ReDigi.json b/test/data/ReqMgr/requests/ReDigi.json
@@ -23,7 +23,7 @@
 		"PrepID": "REDIGITEST-0001",			
 		"Group": "DATAOPS",
         "TimePerEvent": 17.5,
-        "Memory": 2300,
+        "Memory": 2000,
         "SizePerEvent": 342,
         "DbsUrl": "http://cmsdbsprod.cern.ch/cms_dbs_prod_global/servlet/DBSServlet",
         "MCPileup": "/MinBias_TuneZ2star_8TeV-pythia6/Summer12-START50_V13-v3/GEN-SIM",

diff --git a/test/data/ReqMgr/requests/ReReco.json b/test/data/ReqMgr/requests/ReReco.json
@@ -17,7 +17,7 @@
 		"PrepID": "RERECOTEST-0001",
 		"Group": "DATAOPS",
         "TimePerEvent": 12,
-		"Memory": 2394,
+		"Memory": 2000,
         "SizePerEvent":500,
 		"InputDataset": "InputDataset-OVERRIDE-ME",
         "nskims": 1,
@@ -26,7 +26,7 @@
         "Skim1ConfigCacheID": "7559cf7a427be20436483f82fd109301",
         "SkimTimePerEvent1" : 4,
         "SkimSizePerEvent1" : 200,
-        "SkimMemory1" : 2394,
+        "SkimMemory1" : 2000,
         "OpenRunningTimeout" : 0,
         "SplittingAlgo" : "EventAwareLumiBased",
         "EventsPerJob" : 1400