ArielGlenn has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/289397

Change subject: fix link removal for cirrus cearch dumps cleanup
......................................................................

fix link removal for cirrus cearch dumps cleanup

also add a -f to an rm command to reduce cronspam

Change-Id: I6c0a83c67744efc1fb32a3dbd4f30bedf0864c22
---
M modules/snapshot/templates/cron/dumpcirrussearch.sh.erb
1 file changed, 3 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/97/289397/1

diff --git a/modules/snapshot/templates/cron/dumpcirrussearch.sh.erb 
b/modules/snapshot/templates/cron/dumpcirrussearch.sh.erb
index 36b38b3..3b6ddb4 100644
--- a/modules/snapshot/templates/cron/dumpcirrussearch.sh.erb
+++ b/modules/snapshot/templates/cron/dumpcirrussearch.sh.erb
@@ -70,7 +70,7 @@
                                echo rm $folder/*.json.gz
                                echo rmdir $folder
                        else
-                               rm $folder/*.json.gz
+                               rm -f $folder/*.json.gz
                                rmdir $folder
                        fi
                fi
@@ -118,5 +118,6 @@
 
 # Maintain a 'current' symlink always pointing at the most recently completed 
dump
 if [ "$dryrun" == "false" ]; then
-       ln -sf "$targetDir" "$targetDirBase/current"
+        rm -f "$targetDirBase/current"
+       ln -s "$targetDir" "$targetDirBase/current"
 fi

-- 
To view, visit https://gerrit.wikimedia.org/r/289397
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6c0a83c67744efc1fb32a3dbd4f30bedf0864c22
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: ArielGlenn <ar...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to