Skip to content
This repository was archived by the owner on Sep 12, 2024. It is now read-only.

Commit 28e202d

Browse files
authored
Merge pull request #605 from CMSCompOps/changes_eos_cp_mkdir
change eos cp and eos mkdir as per eosteam
2 parents aefde61 + 3b4a236 commit 28e202d

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

cWrap.sh

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ cd $BASE_DIR
1111

1212
modulename=`echo $1 | sed 's/\.py//' | sed 's/Unified\///'`
1313
mkdir -p $HTML_DIR/logs/$modulename/
14-
eos mkdir -p $FINAL_HTML_DIR/logs/$modulename/
14+
env EOS_MGM_URL=root://eoscms.cern.ch eos mkdir -p $FINAL_HTML_DIR/logs/$modulename/
1515

1616
last_log=$HTML_DIR/logs/$modulename/last.log
1717
s_dated_log=$modulename/`date +%F_%T`.log
@@ -24,15 +24,15 @@ echo $$ >> $log
2424
if [ -r unified_drain ] ; then
2525
echo "System is locally draining" >> $log
2626
cp $log $last_log
27-
eos cp $log $FINAL_HTML_DIR/logs/$modulename/.
28-
eos cp $log $FINAL_HTML_DIR/logs/$modulename/last.log
27+
env EOS_MGM_URL=root://eoscms.cern.ch eos cp $log $FINAL_HTML_DIR/logs/$modulename/.
28+
env EOS_MGM_URL=root://eoscms.cern.ch eos cp $log $FINAL_HTML_DIR/logs/$modulename/last.log
2929
exit
3030
fi
3131
if [ -r /eos/cms/store/unified/unified_drain ] ; then
3232
echo "System is globally draining" >> $log
3333
cp $log $last_log
34-
eos cp $log $FINAL_HTML_DIR/logs/$modulename/.
35-
eos cp $log $FINAL_HTML_DIR/logs/$modulename/last.log
34+
env EOS_MGM_URL=root://eoscms.cern.ch eos cp $log $FINAL_HTML_DIR/logs/$modulename/.
35+
env EOS_MGM_URL=root://eoscms.cern.ch eos cp $log $FINAL_HTML_DIR/logs/$modulename/last.log
3636
exit
3737
fi
3838

@@ -74,7 +74,7 @@ echo `date` >> $log
7474

7575
#cp $log $dated_log
7676
cp $log $last_log
77-
eos cp $log $FINAL_HTML_DIR/logs/$modulename/.
78-
eos cp $log $FINAL_HTML_DIR/logs/$modulename/last.log
77+
env EOS_MGM_URL=root://eoscms.cern.ch eos cp $log $FINAL_HTML_DIR/logs/$modulename/.
78+
env EOS_MGM_URL=root://eoscms.cern.ch eos cp $log $FINAL_HTML_DIR/logs/$modulename/last.log
7979

8080
#rm $log

utils.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1237,7 +1237,7 @@ def close(self):
12371237
try:
12381238
print "moving",self.cache_filename,"to",self.eos_filename
12391239
print("Attempt {}".format(T))
1240-
r = os.system("eoscp %s %s"%( self.cache_filename, self.eos_filename))
1240+
r = os.system("env EOS_MGM_URL=root://eoscms.cern.ch eos cp %s %s"%( self.cache_filename, self.eos_filename))
12411241
if r==0 and os.path.getsize(self.eos_filename) > 0: return True
12421242
print "not able to copy to eos",self.eos_filename,"with code",r
12431243
time.sleep(30)
@@ -3028,7 +3028,7 @@ def save(self):
30283028

30293029
## write the information out to disk
30303030
new_base_eos_dir = 'root://eoscms.cern.ch/'+base_eos_dir
3031-
os.system('eoscp %s/closedout.json %s/closedout.json.last'%(new_base_eos_dir, new_base_eos_dir))
3031+
os.system('env EOS_MGM_URL=root://eoscms.cern.ch eos cp %s/closedout.json %s/closedout.json.last'%(new_base_eos_dir, new_base_eos_dir))
30323032

30333033
## merge the content
30343034
try:

0 commit comments

Comments
 (0)