Page MenuHomePhabricator
Files F27321428

No One
Actions

Authored By
• Marostegui
Nov 28 2018, 10:03 AM
Size
5 KB
Referenced Files
None
Subscribers
None

View Options

[10:01:33] marostegui@puppetmaster1001:~$ sudo -i puppet-merge
Fetching new commits from https://gerrit.wikimedia.org/r/p/operations/puppet
remote: Counting objects: 9365, done
remote: Finding sources: 100% (4/4)
remote: Getting sizes: 100% (3/3)
remote: Compressing objects: 100% (15373/15373)
remote: Total 4 (delta 0), reused 0 (delta 0)
Unpacking objects: 100% (4/4), done.
From https://gerrit.wikimedia.org/r/p/operations/puppet
3d8e892354..4caca6dc2a production -> origin/production
HEAD is 3d8e892354585464b28ec94bd807dfb2018fd799, FETCH_HEAD is 4caca6dc2a200f40f4e4186bf1da19d9da077bb1. Reviewing changes...
diff --git a/hieradata/hosts/pc1008.yaml b/hieradata/hosts/pc1008.yaml
index db7a5e5d5a..1c0af1da89 100644
--- a/hieradata/hosts/pc1008.yaml
+++ b/hieradata/hosts/pc1008.yaml
@@ -1,2 +1 @@
mariadb::parsercache::shard: 'pc2'
-profile::base::notifications: disabled
------------------------------
Marostegui: pc1008: Enable notifications (4caca6dc2a)
Merge these changes? (yes/no)? yes
Merging 4caca6dc2a200f40f4e4186bf1da19d9da077bb1...
git merge --ff-only 4caca6dc2a200f40f4e4186bf1da19d9da077bb1
Updating 3d8e892354..4caca6dc2a
Fast-forward
hieradata/hosts/pc1008.yaml | 1 -
1 file changed, 1 deletion(-)
Running git clean to clean any untracked files.
git clean -dffx -e /private/
HEAD is now 4caca6dc2a200f40f4e4186bf1da19d9da077bb1.
/root
Fetching new commits from https://gerrit.wikimedia.org/r/p/operations/puppet
HEAD is 3d8e892354585464b28ec94bd807dfb2018fd799, FETCH_HEAD is 4caca6dc2a200f40f4e4186bf1da19d9da077bb1. Reviewing changes...
------------------------------
Merging 4caca6dc2a200f40f4e4186bf1da19d9da077bb1...
git merge --ff-only 4caca6dc2a200f40f4e4186bf1da19d9da077bb1
Updating 3d8e892354..4caca6dc2a
Fast-forward
hieradata/hosts/pc1008.yaml | 1 -
1 file changed, 1 deletion(-)
Running git clean to clean any untracked files.
git clean -dffx -e /private/
HEAD is now 4caca6dc2a200f40f4e4186bf1da19d9da077bb1.
/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/p/operations/puppet
error: cannot lock ref 'refs/remotes/origin/production': is at 4caca6dc2a200f40f4e4186bf1da19d9da077bb1 but expected d83ccdff2534a9ff335c40930c870a165ae5ea25
From https://gerrit.wikimedia.org/r/p/operations/puppet
! d83ccdff25..4caca6dc2a production -> origin/production (unable to update local ref)
Connection to rhodium.eqiad.wmnet closed.
ERROR: puppet-merge on rhodium.eqiad.wmnet failed
Fetching new commits from https://gerrit.wikimedia.org/r/p/operations/puppet
error: cannot lock ref 'refs/remotes/origin/production': is at 4caca6dc2a200f40f4e4186bf1da19d9da077bb1 but expected d83ccdff2534a9ff335c40930c870a165ae5ea25
From https://gerrit.wikimedia.org/r/p/operations/puppet
! d83ccdff25..4caca6dc2a production -> origin/production (unable to update local ref)
Connection to puppetmaster2001.codfw.wmnet closed.
ERROR: puppet-merge on puppetmaster2001.codfw.wmnet failed
Fetching new commits from https://gerrit.wikimedia.org/r/p/operations/puppet
error: cannot lock ref 'refs/remotes/origin/production': is at 4caca6dc2a200f40f4e4186bf1da19d9da077bb1 but expected d83ccdff2534a9ff335c40930c870a165ae5ea25
From https://gerrit.wikimedia.org/r/p/operations/puppet
! d83ccdff25..4caca6dc2a production -> origin/production (unable to update local ref)
Connection to puppetmaster2002.codfw.wmnet closed.
ERROR: puppet-merge on puppetmaster2002.codfw.wmnet failed
Now running conftool-merge to sync any changes to conftool data
Running conftool-sync on /etc/conftool/data
2018-11-28 10:02:29 [INFO] conftool::yaml_log_error: Error parsing yaml file /etc/conftool/etcdrc: [Errno 2] No such file or directory: '/etc/conftool/etcdrc'
2018-11-28 10:02:29 [INFO] conftool::load_files: Loading data for entity node from /etc/conftool/data
2018-11-28 10:02:29 [INFO] conftool::load_files: Parsing file /etc/conftool/data/node/eqsin.yaml
2018-11-28 10:02:29 [INFO] conftool::load_files: Parsing file /etc/conftool/data/node/codfw.yaml
2018-11-28 10:02:30 [INFO] conftool::load_files: Parsing file /etc/conftool/data/node/ulsfo.yaml
2018-11-28 10:02:30 [INFO] conftool::load_files: Parsing file /etc/conftool/data/node/esams.yaml
2018-11-28 10:02:30 [INFO] conftool::load_files: Parsing file /etc/conftool/data/node/eqiad.yaml
2018-11-28 10:02:30 [INFO] conftool::load_files: Loading data for entity mwconfig from /etc/conftool/data
2018-11-28 10:02:30 [INFO] conftool::load_files: Parsing file /etc/conftool/data/mwconfig/data.yaml
2018-11-28 10:02:30 [INFO] conftool::load_files: Loading data for entity discovery from /etc/conftool/data
2018-11-28 10:02:30 [INFO] conftool::load_files: Parsing file /etc/conftool/data/discovery/mediawiki.yaml
2018-11-28 10:02:30 [INFO] conftool::load_files: Parsing file /etc/conftool/data/discovery/services.yaml
2018-11-28 10:02:30 [INFO] conftool::load_files: Loading data for entity service from /etc/conftool/data
2018-11-28 10:02:30 [INFO] conftool::load_files: Parsing file /etc/conftool/data/service/mediawiki.yaml
2018-11-28 10:02:30 [INFO] conftool::load_files: Parsing file /etc/conftool/data/service/services.yaml
2018-11-28 10:02:30 [INFO] conftool::load_files: Parsing file /etc/conftool/data/service/cache.yaml
2018-11-28 10:02:30 [INFO] conftool::load_files: Parsing file /etc/conftool/data/service/misc.yaml
2018-11-28 10:02:30 [INFO] conftool::load: Adding objects for service
2018-11-28 10:02:30 [INFO] conftool::load: Adding objects for node
2018-11-28 10:02:30 [INFO] conftool::load: Adding objects for mwconfig
2018-11-28 10:02:30 [INFO] conftool::load: Adding objects for discovery
2018-11-28 10:02:30 [INFO] conftool::load: Removing stale objects for discovery
2018-11-28 10:02:30 [INFO] conftool::load: Removing stale objects for mwconfig
2018-11-28 10:02:30 [INFO] conftool::load: Removing stale objects for node
2018-11-28 10:02:30 [INFO] conftool::load: Removing stale objects for service
Done.

File Metadata

Mime Type
text/plain; charset=utf-8
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
6740007
Default Alt Text
(5 KB)

Event Timeline

Content licensed under Creative Commons Attribution-ShareAlike (CC BY-SA) 4.0 unless otherwise noted; code licensed under GNU General Public License (GPL) 2.0 or later and other open source licenses. By using this site, you agree to the Terms of Use, Privacy Policy, and Code of Conduct. · Wikimedia Foundation · Privacy Policy · Code of Conduct · Terms of Use · Disclaimer · CC-BY-SA · GPL