[MediaWiki-commits] [Gerrit] operations/puppet[production]: set up directory for misc cron dumps on dumpsdata, move firs...

[ArielGlenn (Code Review)]

ArielGlenn has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/392085 )

Change subject: set up directory for misc cron dumps on dumpsdata, move first 
cron job
......................................................................


set up directory for misc cron dumps on dumpsdata, move first cron job

We can use a different layout now since this host is internal.

Xml/sql dumps live under (mntpoint)/xmldatadumps/{public,private}
all the rest go under (mntpoint)/otherdumps

First cron job to be moved is an easy one, dump_global_blocks.

Bug: T179942
Change-Id: Ia30c4abb81beb7ea1bb90965a20d7f31565ba725
---
M modules/dumps/manifests/generation/server/dirs.pp
M modules/snapshot/files/cron/dump-global-blocks.sh
M modules/snapshot/manifests/cron/dump_global_blocks.pp
M modules/snapshot/manifests/dumps/dirs.pp
M modules/snapshot/templates/set_dump_dirs.sh.erb
5 files changed, 6 insertions(+), 3 deletions(-)

Approvals:
  ArielGlenn: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/dumps/manifests/generation/server/dirs.pp 
b/modules/dumps/manifests/generation/server/dirs.pp
index dfbb315..17d7ae5 100644
--- a/modules/dumps/manifests/generation/server/dirs.pp
+++ b/modules/dumps/manifests/generation/server/dirs.pp
@@ -7,7 +7,7 @@
     # directories with incoming rsyncs of datasets
     $datadir                      = '/data/xmldatadumps'
     $publicdir                    = '/data/xmldatadumps/public'
-    $otherdir                     = '/data/other'
+    $otherdir                     = '/data/otherdumps'
     $cirrussearchdir              = "${otherdir}/cirrussearch"
     $xlationdir                   = "${otherdir}/contenttranslation"
     $globalblocksdir              = "${otherdir}/globalblocks"
diff --git a/modules/snapshot/files/cron/dump-global-blocks.sh 
b/modules/snapshot/files/cron/dump-global-blocks.sh
index e7e4825..90f80ea 100644
--- a/modules/snapshot/files/cron/dump-global-blocks.sh
+++ b/modules/snapshot/files/cron/dump-global-blocks.sh
@@ -108,7 +108,7 @@
     checkval "$settingname" "${!settingname}"
 done
 
-outputdir="${otherdir}/globalblocks"
+outputdir="${cronsdir}/globalblocks"
 
 host=`get_db_host "$apachedir"` || exit 1
 db_user=`get_db_user "$apachedir"` || exit 1
diff --git a/modules/snapshot/manifests/cron/dump_global_blocks.pp 
b/modules/snapshot/manifests/cron/dump_global_blocks.pp
index 6c8f2f3..71315af 100644
--- a/modules/snapshot/manifests/cron/dump_global_blocks.pp
+++ b/modules/snapshot/manifests/cron/dump_global_blocks.pp
@@ -2,7 +2,8 @@
     $user   = undef,
 ) {
     $confsdir = $snapshot::dumps::dirs::confsdir
-    $otherdir = $snapshot::dumps::dirs::otherdir
+    # $otherdir = $snapshot::dumps::dirs::otherdir
+    $otherdir = $snapshot::dumps::dirs::cronsdir
     $globalblocksdir = "${otherdir}/globalblocks"
 
     file { '/usr/local/bin/dump-global-blocks.sh':
diff --git a/modules/snapshot/manifests/dumps/dirs.pp 
b/modules/snapshot/manifests/dumps/dirs.pp
index 01736b3..d54bd13 100644
--- a/modules/snapshot/manifests/dumps/dirs.pp
+++ b/modules/snapshot/manifests/dumps/dirs.pp
@@ -14,6 +14,7 @@
 
     $miscdumpsdir = "${miscdumpsmount}/xmldatadumps"
     $xmldumpsdir = "${xmldumpsmount}/xmldatadumps"
+    $cronsdir = "${xmldumpsmount}/otherdumps"
 
     $apachedir = '/srv/mediawiki'
     $confsdir = "${dumpsdir}/confs"
diff --git a/modules/snapshot/templates/set_dump_dirs.sh.erb 
b/modules/snapshot/templates/set_dump_dirs.sh.erb
index fbb73e9..6313c23 100644
--- a/modules/snapshot/templates/set_dump_dirs.sh.erb
+++ b/modules/snapshot/templates/set_dump_dirs.sh.erb
@@ -6,5 +6,6 @@
 xmldumpsdir="<%= scope.lookupvar('snapshot::dumps::dirs::xmldumpsdir') -%>"
 miscdumpsdir="<%= scope.lookupvar('snapshot::dumps::dirs::miscdumpsdir') -%>"
 otherdir="<%= scope.lookupvar('snapshot::dumps::dirs::otherdir') -%>"
+cronsdir="<%= scope.lookupvar('snapshot::dumps::dirs::cronsdir') -%>"
 dumpsdir="<%= scope.lookupvar('snapshot::dumps::dirs::dumpsdir') -%>"
 dblistsdir="<%= scope.lookupvar('snapshot::dumps::dirs::dblistsdir') -%>"

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia30c4abb81beb7ea1bb90965a20d7f31565ba725
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: ArielGlenn <ar...@wikimedia.org>
Gerrit-Reviewer: ArielGlenn <ar...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

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