Page MenuHomePhabricator
Paste P8806

some puppetmasters out of sync
ActivePublic

Authored by CDanis on Thu, Jul 25, 3:51 PM.
cdanis@puppetmaster1001.eqiad.wmnet ~ ☕ sudo -i puppet-merge
Checking for pending merges in /labs/private
Fetching new commits from https://gerrit.wikimedia.org/r/labs/private
No changes to merge.
Fetching new commits from https://gerrit.wikimedia.org/r/operations/puppet
remote: Counting objects: 9918, done
remote: Finding sources: 100% (7/7)
remote: Total 7 (delta 6), reused 7 (delta 6)
Unpacking objects: 100% (7/7), done.
From https://gerrit.wikimedia.org/r/operations/puppet
0a06c0460f..98f6c17164 production -> origin/production
HEAD is 0a06c0460fcb2b041ee52d153adcafd4744c8193, FETCH_HEAD is 98f6c17164fb8e7a7217a7f62a2e163a025a31b7. Reviewing changes...
diff --git a/modules/profile/manifests/conftool/dbctl_client.pp b/modules/profile/manifests/conftool/dbctl_client.pp
index dab030bd02..086a780bd7 100644
--- a/modules/profile/manifests/conftool/dbctl_client.pp
+++ b/modules/profile/manifests/conftool/dbctl_client.pp
@@ -1,5 +1,5 @@
class profile::conftool::dbctl_client() {
require ::profile::conftool::client
- require_package('python3-conftool-dbctl')
+ require_package('python3-conftool-dbctl', 'etcd-client')
}
------------------------------
Chris Danis: install etcd-client on cumin hosts (98f6c17164)
Merge these changes? (yes/no)? yes
Merging 98f6c17164fb8e7a7217a7f62a2e163a025a31b7...
git merge --ff-only 98f6c17164fb8e7a7217a7f62a2e163a025a31b7
Updating 0a06c0460f..98f6c17164
Fast-forward
modules/profile/manifests/conftool/dbctl_client.pp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Running git clean to clean any untracked files.
git clean -dffx -e /private/
HEAD is now 98f6c17164fb8e7a7217a7f62a2e163a025a31b7.
/root
Fetching new commits from https://gerrit.wikimedia.org/r/operations/puppet
remote: Counting objects: 9918, done
remote: Finding sources: 100% (7/7)
remote: Total 7 (delta 6), reused 7 (delta 6)
Unpacking objects: 100% (7/7), done.
From https://gerrit.wikimedia.org/r/operations/puppet
0a06c0460f..98f6c17164 production -> origin/production
HEAD is 0a06c0460fcb2b041ee52d153adcafd4744c8193, FETCH_HEAD is 98f6c17164fb8e7a7217a7f62a2e163a025a31b7. Reviewing changes...
------------------------------
Merging 98f6c17164fb8e7a7217a7f62a2e163a025a31b7...
git merge --ff-only 98f6c17164fb8e7a7217a7f62a2e163a025a31b7
Updating 0a06c0460f..98f6c17164
Fast-forward
modules/profile/manifests/conftool/dbctl_client.pp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Running git clean to clean any untracked files.
git clean -dffx -e /private/
HEAD is now 98f6c17164fb8e7a7217a7f62a2e163a025a31b7.
/var/lib/git/operations/puppet
Connection to puppetmaster1002.eqiad.wmnet closed.
OK: puppet-merge on puppetmaster1002.eqiad.wmnet succeeded
Fetching new commits from https://gerrit.wikimedia.org/r/operations/puppet
remote: Counting objects: 9918, done
remote: Finding sources: 100% (7/7)
remote: Total 7 (delta 6), reused 7 (delta 6)
Unpacking objects: 100% (7/7), done.
From https://gerrit.wikimedia.org/r/operations/puppet
0a06c0460f..98f6c17164 production -> origin/production
HEAD is 0a06c0460fcb2b041ee52d153adcafd4744c8193, FETCH_HEAD is 98f6c17164fb8e7a7217a7f62a2e163a025a31b7. Reviewing changes...
------------------------------
Merging 98f6c17164fb8e7a7217a7f62a2e163a025a31b7...
git merge --ff-only 98f6c17164fb8e7a7217a7f62a2e163a025a31b7
Updating 0a06c0460f..98f6c17164
Fast-forward
modules/profile/manifests/conftool/dbctl_client.pp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Running git clean to clean any untracked files.
git clean -dffx -e /private/
HEAD is now 98f6c17164fb8e7a7217a7f62a2e163a025a31b7.
/var/lib/git/operations/puppet
Connection to puppetmaster1003.eqiad.wmnet closed.
OK: puppet-merge on puppetmaster1003.eqiad.wmnet succeeded
Fetching new commits from https://gerrit.wikimedia.org/r/operations/puppet
remote: Counting objects: 9918, done
remote: Finding sources: 100% (7/7)
remote: Total 7 (delta 6), reused 7 (delta 6)
Unpacking objects: 100% (7/7), done.
From https://gerrit.wikimedia.org/r/operations/puppet
0a06c0460f..98f6c17164 production -> origin/production
HEAD is f3041cf2052c0856e4342730091d788ebde49137, FETCH_HEAD is 98f6c17164fb8e7a7217a7f62a2e163a025a31b7. Reviewing changes...
------------------------------
WARNING: Revision range includes commits from multiple committers!
Merging 98f6c17164fb8e7a7217a7f62a2e163a025a31b7...
git merge --ff-only 98f6c17164fb8e7a7217a7f62a2e163a025a31b7
Updating f3041cf205..98f6c17164
Fast-forward
modules/profile/manifests/bird/anycast_monitoring.pp | 13 ++++++++++---
modules/profile/manifests/conftool/dbctl_client.pp | 2 +-
2 files changed, 11 insertions(+), 4 deletions(-)
Running git clean to clean any untracked files.
git clean -dffx -e /private/
HEAD is now 98f6c17164fb8e7a7217a7f62a2e163a025a31b7.
/var/lib/git/operations/puppet
Connection to rhodium.eqiad.wmnet closed.
OK: puppet-merge on rhodium.eqiad.wmnet succeeded
Fetching new commits from https://gerrit.wikimedia.org/r/operations/puppet
remote: Counting objects: 9918, done
remote: Finding sources: 100% (7/7)
remote: Total 7 (delta 6), reused 7 (delta 6)
Unpacking objects: 100% (7/7), done.
From https://gerrit.wikimedia.org/r/operations/puppet
0a06c0460f..98f6c17164 production -> origin/production
HEAD is f3041cf2052c0856e4342730091d788ebde49137, FETCH_HEAD is 98f6c17164fb8e7a7217a7f62a2e163a025a31b7. Reviewing changes...
------------------------------
WARNING: Revision range includes commits from multiple committers!
Merging 98f6c17164fb8e7a7217a7f62a2e163a025a31b7...
git merge --ff-only 98f6c17164fb8e7a7217a7f62a2e163a025a31b7
Updating f3041cf205..98f6c17164
Fast-forward
modules/profile/manifests/bird/anycast_monitoring.pp | 13 ++++++++++---
modules/profile/manifests/conftool/dbctl_client.pp | 2 +-
2 files changed, 11 insertions(+), 4 deletions(-)
Running git clean to clean any untracked files.
git clean -dffx -e /private/
HEAD is now 98f6c17164fb8e7a7217a7f62a2e163a025a31b7.
/var/lib/git/operations/puppet
Connection to puppetmaster2001.codfw.wmnet closed.
OK: puppet-merge on puppetmaster2001.codfw.wmnet succeeded
Fetching new commits from https://gerrit.wikimedia.org/r/operations/puppet
remote: Counting objects: 9918, done
remote: Finding sources: 100% (7/7)
remote: Total 7 (delta 6), reused 7 (delta 6)
Unpacking objects: 100% (7/7), done.
From https://gerrit.wikimedia.org/r/operations/puppet
0a06c0460f..98f6c17164 production -> origin/production
HEAD is f3041cf2052c0856e4342730091d788ebde49137, FETCH_HEAD is 98f6c17164fb8e7a7217a7f62a2e163a025a31b7. Reviewing changes...
------------------------------
WARNING: Revision range includes commits from multiple committers!
Merging 98f6c17164fb8e7a7217a7f62a2e163a025a31b7...
git merge --ff-only 98f6c17164fb8e7a7217a7f62a2e163a025a31b7
Updating f3041cf205..98f6c17164
Fast-forward
modules/profile/manifests/bird/anycast_monitoring.pp | 13 ++++++++++---
modules/profile/manifests/conftool/dbctl_client.pp | 2 +-
2 files changed, 11 insertions(+), 4 deletions(-)
Running git clean to clean any untracked files.
git clean -dffx -e /private/
HEAD is now 98f6c17164fb8e7a7217a7f62a2e163a025a31b7.
/var/lib/git/operations/puppet
Connection to puppetmaster2002.codfw.wmnet closed.
OK: puppet-merge on puppetmaster2002.codfw.wmnet succeeded
Now running conftool-merge to sync any changes to conftool data
Running conftool-sync on /etc/conftool/data
2019-07-25 15:40:45 [INFO] conftool::yaml_log_error: Error parsing yaml file /etc/conftool/etcdrc: [Errno 2] No such file or directory: '/etc/conftool/etcdrc'
2019-07-25 15:40:46 [INFO] conftool::load_files: Loading data for entity mwconfig from /etc/conftool/data
2019-07-25 15:40:46 [INFO] conftool::load_files: Parsing file /etc/conftool/data/mwconfig/data.yaml
2019-07-25 15:40:46 [INFO] conftool::load_files: Loading data for entity dbconfig-section from /etc/conftool/data
2019-07-25 15:40:46 [ERROR] conftool::load_files: Data dir /etc/conftool/data/dbconfig-section does not exist, will NOT remove missing entities
2019-07-25 15:40:46 [INFO] conftool::load_files: Loading data for entity service from /etc/conftool/data
2019-07-25 15:40:46 [INFO] conftool::load_files: Parsing file /etc/conftool/data/service/mediawiki.yaml
2019-07-25 15:40:46 [INFO] conftool::load_files: Parsing file /etc/conftool/data/service/services.yaml
2019-07-25 15:40:46 [INFO] conftool::load_files: Parsing file /etc/conftool/data/service/cache.yaml
2019-07-25 15:40:46 [INFO] conftool::load_files: Parsing file /etc/conftool/data/service/misc.yaml
2019-07-25 15:40:46 [INFO] conftool::load_files: Loading data for entity node from /etc/conftool/data
2019-07-25 15:40:46 [INFO] conftool::load_files: Parsing file /etc/conftool/data/node/eqsin.yaml
2019-07-25 15:40:46 [INFO] conftool::load_files: Parsing file /etc/conftool/data/node/codfw.yaml
2019-07-25 15:40:46 [INFO] conftool::load_files: Parsing file /etc/conftool/data/node/ulsfo.yaml
2019-07-25 15:40:46 [INFO] conftool::load_files: Parsing file /etc/conftool/data/node/esams.yaml
2019-07-25 15:40:46 [INFO] conftool::load_files: Parsing file /etc/conftool/data/node/eqiad.yaml
2019-07-25 15:40:46 [INFO] conftool::load_files: Loading data for entity dbconfig-instance from /etc/conftool/data
2019-07-25 15:40:46 [ERROR] conftool::load_files: Data dir /etc/conftool/data/dbconfig-instance does not exist, will NOT remove missing entities
2019-07-25 15:40:46 [INFO] conftool::load_files: Loading data for entity discovery from /etc/conftool/data
2019-07-25 15:40:46 [INFO] conftool::load_files: Parsing file /etc/conftool/data/discovery/mediawiki.yaml
2019-07-25 15:40:46 [INFO] conftool::load_files: Parsing file /etc/conftool/data/discovery/services.yaml
2019-07-25 15:40:46 [INFO] conftool::load: Adding objects for mwconfig
2019-07-25 15:40:46 [INFO] conftool::load: Adding objects for dbconfig-section
2019-07-25 15:40:46 [INFO] conftool::load: Adding objects for service
2019-07-25 15:40:46 [INFO] conftool::load: Adding objects for node
2019-07-25 15:40:46 [INFO] conftool::load: Adding objects for dbconfig-instance
2019-07-25 15:40:46 [INFO] conftool::load: Adding objects for discovery
2019-07-25 15:40:46 [INFO] conftool::load: Removing stale objects for discovery
2019-07-25 15:40:46 [INFO] conftool::load: Removing stale objects for dbconfig-instance
2019-07-25 15:40:46 [INFO] conftool::load: Removing stale objects for node
2019-07-25 15:40:46 [INFO] conftool::load: Removing stale objects for service
2019-07-25 15:40:46 [INFO] conftool::load: Removing stale objects for dbconfig-section
2019-07-25 15:40:46 [INFO] conftool::load: Removing stale objects for mwconfig
Done.

Event Timeline

CDanis created this paste.Thu, Jul 25, 3:51 PM