from:"Mobrovac \(Code Review\)"

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update restbase to 67aff21

2017-10-17 Thread Mobrovac (Code Review)

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

Change subject: Update restbase to 67aff21
..


Update restbase to 67aff21

List of changes:
67aff21 Add mediawiki history metrics endpoints

Change-Id: I0a5669156a004e0a5e012cf47e2523e36d8b8c22
---
M restbase
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Mobrovac: Verified; Looks good to me, approved



diff --git a/restbase b/restbase
index 2ae3a82..67aff21 16
--- a/restbase
+++ b/restbase
@@ -1 +1 @@
-Subproject commit 2ae3a82d4daeb84c936d647700517044ccb15465
+Subproject commit 67aff21c3393e723cbe38569af281e6a621e0005

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0a5669156a004e0a5e012cf47e2523e36d8b8c22
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/restbase/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 
Gerrit-Reviewer: Mobrovac 

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update restbase to 67aff21

2017-10-17 Thread Mobrovac (Code Review)

Mobrovac has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/384665 )

Change subject: Update restbase to 67aff21
..

Update restbase to 67aff21

List of changes:
67aff21 Add mediawiki history metrics endpoints

Change-Id: I0a5669156a004e0a5e012cf47e2523e36d8b8c22
---
M restbase
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/restbase/deploy 
refs/changes/65/384665/1

diff --git a/restbase b/restbase
index 2ae3a82..67aff21 16
--- a/restbase
+++ b/restbase
@@ -1 +1 @@
-Subproject commit 2ae3a82d4daeb84c936d647700517044ccb15465
+Subproject commit 67aff21c3393e723cbe38569af281e6a621e0005

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0a5669156a004e0a5e012cf47e2523e36d8b8c22
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/restbase/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Config: Use TLS in beta

2017-10-17 Thread Mobrovac (Code Review)

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

Change subject: Config: Use TLS in beta
..


Config: Use TLS in beta

Change-Id: I22deabbfee432007dbb909e10033d2ed256a0e50
---
M scap/environments/beta/vars.yaml
M scap/templates/config.yaml.j2
M scap/vars.yaml
3 files changed, 3 insertions(+), 0 deletions(-)

Approvals:
  Mobrovac: Verified; Looks good to me, approved



diff --git a/scap/environments/beta/vars.yaml b/scap/environments/beta/vars.yaml
index 80069e9..6f30b15 100644
--- a/scap/environments/beta/vars.yaml
+++ b/scap/environments/beta/vars.yaml
@@ -1,3 +1,4 @@
+env: beta
 salt_key: '123456'
 page_size: 10
 user_agent: RESTBase/deployment-prep
diff --git a/scap/templates/config.yaml.j2 b/scap/templates/config.yaml.j2
index 5619db0..2e28fa2 100644
--- a/scap/templates/config.yaml.j2
+++ b/scap/templates/config.yaml.j2
@@ -83,6 +83,7 @@
   username: <%= cassandra_user %>
   password: <%= cassandra_password %>
   defaultConsistency: <%= cassandra_default_consistency %>
+  <% if env == 'beta' %>tls: { ca: '/dev/null' }<% endif %>
   <% if cassandra_tls is not none and cassandra_tls|length > 0 
%>tls:<% for key, value in cassandra_tls.iteritems() %>
 <%= key %>: <%= value -%>
 <% endfor -%>
diff --git a/scap/vars.yaml b/scap/vars.yaml
index 656fc15..b972264 100644
--- a/scap/vars.yaml
+++ b/scap/vars.yaml
@@ -8,6 +8,7 @@
 metrics_host: localhost
 metrics_port: 8252
 # service
+env: production
 mwapi_uri: http://localhost/w/api.php
 ipaddress: '127.0.0.1'
 rl_seeds: []

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I22deabbfee432007dbb909e10033d2ed256a0e50
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/restbase/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 
Gerrit-Reviewer: Mobrovac 

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Config: Use TLS in beta

2017-10-17 Thread Mobrovac (Code Review)

Mobrovac has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/384658 )

Change subject: Config: Use TLS in beta
..

Config: Use TLS in beta

Change-Id: I22deabbfee432007dbb909e10033d2ed256a0e50
---
M scap/environments/beta/vars.yaml
M scap/templates/config.yaml.j2
M scap/vars.yaml
3 files changed, 3 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/restbase/deploy 
refs/changes/58/384658/1

diff --git a/scap/environments/beta/vars.yaml b/scap/environments/beta/vars.yaml
index 80069e9..6f30b15 100644
--- a/scap/environments/beta/vars.yaml
+++ b/scap/environments/beta/vars.yaml
@@ -1,3 +1,4 @@
+env: beta
 salt_key: '123456'
 page_size: 10
 user_agent: RESTBase/deployment-prep
diff --git a/scap/templates/config.yaml.j2 b/scap/templates/config.yaml.j2
index 5619db0..2e28fa2 100644
--- a/scap/templates/config.yaml.j2
+++ b/scap/templates/config.yaml.j2
@@ -83,6 +83,7 @@
   username: <%= cassandra_user %>
   password: <%= cassandra_password %>
   defaultConsistency: <%= cassandra_default_consistency %>
+  <% if env == 'beta' %>tls: { ca: '/dev/null' }<% endif %>
   <% if cassandra_tls is not none and cassandra_tls|length > 0 
%>tls:<% for key, value in cassandra_tls.iteritems() %>
 <%= key %>: <%= value -%>
 <% endfor -%>
diff --git a/scap/vars.yaml b/scap/vars.yaml
index 656fc15..b972264 100644
--- a/scap/vars.yaml
+++ b/scap/vars.yaml
@@ -8,6 +8,7 @@
 metrics_host: localhost
 metrics_port: 8252
 # service
+env: production
 mwapi_uri: http://localhost/w/api.php
 ipaddress: '127.0.0.1'
 rl_seeds: []

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I22deabbfee432007dbb909e10033d2ed256a0e50
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/restbase/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Add amwikimedia to restbase domains

2017-10-16 Thread Mobrovac (Code Review)

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

Change subject: Add amwikimedia to restbase domains
..


Add amwikimedia to restbase domains

Bug: T176042
Change-Id: I5e2c35b9a9fae5ea33210520c15a1609a832240b
---
M scap/vars.yaml
1 file changed, 1 insertion(+), 0 deletions(-)

Approvals:
  Mobrovac: Verified; Looks good to me, approved



diff --git a/scap/vars.yaml b/scap/vars.yaml
index 870caa0..656fc15 100644
--- a/scap/vars.yaml
+++ b/scap/vars.yaml
@@ -783,6 +783,7 @@
 vi.wikivoyage.org: default_project
 zh.wikivoyage.org: default_project
   Wikimedia:
+am.wikimedia.org: default_project
 ar.wikimedia.org: default_project
 bd.wikimedia.org: default_project
 be.wikimedia.org: default_project

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5e2c35b9a9fae5ea33210520c15a1609a832240b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/restbase/deploy
Gerrit-Branch: master
Gerrit-Owner: Ladsgroup 
Gerrit-Reviewer: Mobrovac 

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update restbase to ed5c703

2017-10-04 Thread Mobrovac (Code Review)

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

Change subject: Update restbase to ed5c703
..


Update restbase to ed5c703

List of changes:
ed5c703 Switch to use the new buckets for feeds

Change-Id: I98c7ab415e01af552e56b5916d6762194bef6123
---
M restbase
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Mobrovac: Verified; Looks good to me, approved



diff --git a/restbase b/restbase
index 2275635..ed5c703 16
--- a/restbase
+++ b/restbase
@@ -1 +1 @@
-Subproject commit 2275635e9e7e072ba7922b92e355d216cda6635e
+Subproject commit ed5c703137e22896b79498dffccb3069b47b12ba

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I98c7ab415e01af552e56b5916d6762194bef6123
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/restbase/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 
Gerrit-Reviewer: Mobrovac 

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update restbase to ed5c703

2017-10-04 Thread Mobrovac (Code Review)

Mobrovac has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/382130 )

Change subject: Update restbase to ed5c703
..

Update restbase to ed5c703

List of changes:
ed5c703 Switch to use the new buckets for feeds

Change-Id: I98c7ab415e01af552e56b5916d6762194bef6123
---
M restbase
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/restbase/deploy 
refs/changes/30/382130/1

diff --git a/restbase b/restbase
index 2275635..ed5c703 16
--- a/restbase
+++ b/restbase
@@ -1 +1 @@
-Subproject commit 2275635e9e7e072ba7922b92e355d216cda6635e
+Subproject commit ed5c703137e22896b79498dffccb3069b47b12ba

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I98c7ab415e01af552e56b5916d6762194bef6123
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/restbase/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update restbase to 2275635

2017-10-03 Thread Mobrovac (Code Review)

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

Change subject: Update restbase to 2275635
..


Update restbase to 2275635

List of changes:
c61140b Make a proper key_value for the new storage
2275635 Import the proper spec

Change-Id: I8747c3733f32f82ad59996064f8b294c8eb02573
---
M restbase
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Mobrovac: Verified; Looks good to me, approved



diff --git a/restbase b/restbase
index b6d248a..2275635 16
--- a/restbase
+++ b/restbase
@@ -1 +1 @@
-Subproject commit b6d248a6236df0e7da36c31a983a7d284b16c365
+Subproject commit 2275635e9e7e072ba7922b92e355d216cda6635e

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8747c3733f32f82ad59996064f8b294c8eb02573
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/restbase/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 
Gerrit-Reviewer: Mobrovac 

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update restbase to 2275635

2017-10-03 Thread Mobrovac (Code Review)

Mobrovac has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/381994 )

Change subject: Update restbase to 2275635
..

Update restbase to 2275635

List of changes:
c61140b Make a proper key_value for the new storage
2275635 Import the proper spec

Change-Id: I8747c3733f32f82ad59996064f8b294c8eb02573
---
M restbase
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/restbase/deploy 
refs/changes/94/381994/1

diff --git a/restbase b/restbase
index b6d248a..2275635 16
--- a/restbase
+++ b/restbase
@@ -1 +1 @@
-Subproject commit b6d248a6236df0e7da36c31a983a7d284b16c365
+Subproject commit 2275635e9e7e072ba7922b92e355d216cda6635e

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8747c3733f32f82ad59996064f8b294c8eb02573
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/restbase/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update restbase to b6d248a

2017-10-03 Thread Mobrovac (Code Review)

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

Change subject: Update restbase to b6d248a
..


Update restbase to b6d248a

List of changes:
b6d248a Switch feeds to the new storage. Step 1

Change-Id: I7fa63b748b2d98e7e55fb18d339ad2f565ab8b69
---
M restbase
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Mobrovac: Verified; Looks good to me, approved



diff --git a/restbase b/restbase
index c463559..b6d248a 16
--- a/restbase
+++ b/restbase
@@ -1 +1 @@
-Subproject commit c463559a69cc7964d2dcddeca3402acfa2647a91
+Subproject commit b6d248a6236df0e7da36c31a983a7d284b16c365

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7fa63b748b2d98e7e55fb18d339ad2f565ab8b69
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/restbase/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 
Gerrit-Reviewer: Mobrovac 

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update restbase to b6d248a

2017-10-03 Thread Mobrovac (Code Review)

Mobrovac has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/381941 )

Change subject: Update restbase to b6d248a
..

Update restbase to b6d248a

List of changes:
b6d248a Switch feeds to the new storage. Step 1

Change-Id: I7fa63b748b2d98e7e55fb18d339ad2f565ab8b69
---
M restbase
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/restbase/deploy 
refs/changes/41/381941/1

diff --git a/restbase b/restbase
index c463559..b6d248a 16
--- a/restbase
+++ b/restbase
@@ -1 +1 @@
-Subproject commit c463559a69cc7964d2dcddeca3402acfa2647a91
+Subproject commit b6d248a6236df0e7da36c31a983a7d284b16c365

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7fa63b748b2d98e7e55fb18d339ad2f565ab8b69
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/restbase/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 

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

[MediaWiki-commits] [Gerrit] mediawiki...EventBus[master]: Emit the page-stable-revision-change event

2017-09-27 Thread Mobrovac (Code Review)

Mobrovac has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/381010 )

Change subject: Emit the page-stable-revision-change event
..

Emit the page-stable-revision-change event

Bug: T169116
Depends-On: I4e3dcc887a5c73fe8d842f02c061f6dcbd376d6a
Depends-On: I23f86a291e0dba9e81c03997b236c7fddd7c376f
Change-Id: Ib80b47ddc52fe1e677e3798b07bfe22a49d226e1
---
M EventBus.hooks.php
M extension.json
2 files changed, 53 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/EventBus 
refs/changes/10/381010/1

diff --git a/EventBus.hooks.php b/EventBus.hooks.php
index ae118d6..94b71a4 100644
--- a/EventBus.hooks.php
+++ b/EventBus.hooks.php
@@ -684,4 +684,54 @@
}
);
}
+
+   /**
+* Sends a page-stable-revision-change event
+*
+* @param FlaggableWikiPage $article the article for which the stable 
rev has changed
+* @param FlaggedRevision $newStableRev the new stable revision (can be 
null)
+* @param FlaggedRevision $oldStableRev the old stable revision (can be 
null)
+*/
+   public static function onFlaggedRevsStableRevisionUpdate(
+   $article,
+   $newStableRev,
+   $oldStableRev
+   ) {
+
+   global $wgDBname;
+   $events = [];
+   $new_stable = $newStableRev ? $newStableRev->getRevision() : 0;
+   $old_stable = $oldStableRev ? $oldStableRev->getRevision() : 0;
+   $user = $newStableRev ? $newStableRev->getUser() : 
$oldStableRev->getUser();
+
+   // Create a mediawiki page stable revision change event.
+   $attrs = [
+   // Common Mediawiki entity fields
+   'database'   => $wgDBname,
+   'performer'  => EventBus::createPerformerAttrs( 
$user ),
+   // page entity fields
+   'page_id'=> $article->getId(),
+   'page_title' => 
$article->getTitle()->getPrefixedDBkey(),
+   'page_namespace' => 
$article->getTitle()->getNamespace(),
+   'page_is_redirect'   => $article->isRedirect(),
+   'rev_id' => 
$article->getTitle()->getLatestRevID(),
+   'stable_rev_id'  => $new_stable,
+   'prior_state'=> [
+   'stable_rev_id'=> $old_stable
+   ]
+   ];
+
+   $events[] = EventBus::createEvent(
+   EventBus::getArticleURL( $article->getTitle() ),
+   'mediawiki.page-stable-revision-change',
+   );
+
+   DeferredUpdates::addCallableUpdate(
+   function () use ( $events ) {
+   EventBus::getInstance()->send( $events );
+   }
+   );
+
+   }
+
 }
diff --git a/extension.json b/extension.json
index f887d04..32f0cb9 100644
--- a/extension.json
+++ b/extension.json
@@ -62,6 +62,9 @@
],
"ArticleProtectComplete": [
"EventBusHooks::onArticleProtectComplete"
+   ],
+   "FlaggedRevsStableRevisionUpdate": [
+   "EventBusHooks::onFlaggedRevsStableRevisionUpdate"
]
},
"manifest_version": 1

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib80b47ddc52fe1e677e3798b07bfe22a49d226e1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/EventBus
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Config: Use `title/{title}/{revision}` instead of `revision/...

2017-09-27 Thread Mobrovac (Code Review)

Mobrovac has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/380932 )

Change subject: Config: Use `title/{title}/{revision}` instead of 
`revision/{revision}`
..

Config: Use `title/{title}/{revision}` instead of `revision/{revision}`

Bug: T158100
Change-Id: I60ac2a9ae653c1b58217d2b09e69157e396d3840
---
M scap/templates/config.yaml.j2
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/services/change-propagation/deploy 
refs/changes/32/380932/1

diff --git a/scap/templates/config.yaml.j2 b/scap/templates/config.yaml.j2
index 2a1a23a..efd101b 100644
--- a/scap/templates/config.yaml.j2
+++ b/scap/templates/config.yaml.j2
@@ -242,7 +242,7 @@
 page_namespace: 120
 exec:
   method: get
-  uri: '<%= restbase_uri 
%>/{{message.meta.domain}}/v1/page/revision/{{message.rev_id}}'
+  uri: '<%= restbase_uri 
%>/{{message.meta.domain}}/v1/page/title/{message.page_title}/{{message.rev_id}}'
   headers:
 cache-control: no-cache
   query:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I60ac2a9ae653c1b58217d2b09e69157e396d3840
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/change-propagation/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Config: Use `title/{title}/{revision}` instead of `revision/...

2017-09-27 Thread Mobrovac (Code Review)

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

Change subject: Config: Use `title/{title}/{revision}` instead of 
`revision/{revision}`
..


Config: Use `title/{title}/{revision}` instead of `revision/{revision}`

Bug: T158100
Change-Id: I60ac2a9ae653c1b58217d2b09e69157e396d3840
---
M scap/templates/config.yaml.j2
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Mobrovac: Verified; Looks good to me, approved



diff --git a/scap/templates/config.yaml.j2 b/scap/templates/config.yaml.j2
index 2a1a23a..efd101b 100644
--- a/scap/templates/config.yaml.j2
+++ b/scap/templates/config.yaml.j2
@@ -242,7 +242,7 @@
 page_namespace: 120
 exec:
   method: get
-  uri: '<%= restbase_uri 
%>/{{message.meta.domain}}/v1/page/revision/{{message.rev_id}}'
+  uri: '<%= restbase_uri 
%>/{{message.meta.domain}}/v1/page/title/{message.page_title}/{{message.rev_id}}'
   headers:
 cache-control: no-cache
   query:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I60ac2a9ae653c1b58217d2b09e69157e396d3840
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/change-propagation/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 
Gerrit-Reviewer: Mobrovac 

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update change-propagation to 2467ebd

2017-09-27 Thread Mobrovac (Code Review)

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

Change subject: Update change-propagation to 2467ebd
..


Update change-propagation to 2467ebd

List of changes:
7dd3d11 Added basic jobqueue config tests
b303c5b Removed debugging console.log
2faff71 Emit broker statistics more frequently
2467ebd Config: Use `title/{title}/{revision}` instead of `revision/{revision}`

Change-Id: If938b5584caeb9bed5d7f5b246d0951ba5efb4f4
---
M src
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Mobrovac: Verified; Looks good to me, approved



diff --git a/src b/src
index 6a6740f..2467ebd 16
--- a/src
+++ b/src
@@ -1 +1 @@
-Subproject commit 6a6740f6e7c7b5beabfb8226eb89aa7ef629cf51
+Subproject commit 2467ebd0f57855c0aae69286c83dcf0f24725e91

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If938b5584caeb9bed5d7f5b246d0951ba5efb4f4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/change-propagation/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 
Gerrit-Reviewer: Mobrovac 

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update change-propagation to 2467ebd

2017-09-27 Thread Mobrovac (Code Review)

Mobrovac has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/380931 )

Change subject: Update change-propagation to 2467ebd
..

Update change-propagation to 2467ebd

List of changes:
7dd3d11 Added basic jobqueue config tests
b303c5b Removed debugging console.log
2faff71 Emit broker statistics more frequently
2467ebd Config: Use `title/{title}/{revision}` instead of `revision/{revision}`

Change-Id: If938b5584caeb9bed5d7f5b246d0951ba5efb4f4
---
M src
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/services/change-propagation/deploy 
refs/changes/31/380931/1

diff --git a/src b/src
index 6a6740f..2467ebd 16
--- a/src
+++ b/src
@@ -1 +1 @@
-Subproject commit 6a6740f6e7c7b5beabfb8226eb89aa7ef629cf51
+Subproject commit 2467ebd0f57855c0aae69286c83dcf0f24725e91

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If938b5584caeb9bed5d7f5b246d0951ba5efb4f4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/change-propagation/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update restbase to c463559

2017-09-27 Thread Mobrovac (Code Review)

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

Change subject: Update restbase to c463559
..


Update restbase to c463559

List of changes:
c463559 Introduce the `/page/title/{title}/{revision}` route

Change-Id: I965f7174cafdcf6e3c861fe608606985f1a58936
---
M restbase
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Mobrovac: Verified; Looks good to me, approved



diff --git a/restbase b/restbase
index df0d128..c463559 16
--- a/restbase
+++ b/restbase
@@ -1 +1 @@
-Subproject commit df0d1280153382e57827cba1de64fcfabeb74a98
+Subproject commit c463559a69cc7964d2dcddeca3402acfa2647a91

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I965f7174cafdcf6e3c861fe608606985f1a58936
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/restbase/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 
Gerrit-Reviewer: Mobrovac 

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update restbase to c463559

2017-09-27 Thread Mobrovac (Code Review)

Mobrovac has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/380928 )

Change subject: Update restbase to c463559
..

Update restbase to c463559

List of changes:
c463559 Introduce the `/page/title/{title}/{revision}` route

Change-Id: I965f7174cafdcf6e3c861fe608606985f1a58936
---
M restbase
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/restbase/deploy 
refs/changes/28/380928/1

diff --git a/restbase b/restbase
index df0d128..c463559 16
--- a/restbase
+++ b/restbase
@@ -1 +1 @@
-Subproject commit df0d1280153382e57827cba1de64fcfabeb74a98
+Subproject commit c463559a69cc7964d2dcddeca3402acfa2647a91

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I965f7174cafdcf6e3c861fe608606985f1a58936
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/restbase/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 

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

[MediaWiki-commits] [Gerrit] mediawiki/event-schemas[master]: Add the mediawiki/page/stable-revision-change event schema

2017-09-26 Thread Mobrovac (Code Review)

Mobrovac has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/380817 )

Change subject: Add the mediawiki/page/stable-revision-change event schema
..

Add the mediawiki/page/stable-revision-change event schema

The event schema will allow the system to track changes in stable
revisions for pages as modified via the FlaggedRevs extension.

Bug: T169116
Change-Id: I4e3dcc887a5c73fe8d842f02c061f6dcbd376d6a
---
M config/eventbus-topics.yaml
A jsonschema/mediawiki/page/stable-revision-change/1.yaml
2 files changed, 143 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/event-schemas 
refs/changes/17/380817/1

diff --git a/config/eventbus-topics.yaml b/config/eventbus-topics.yaml
index c26946e..935ba1b 100644
--- a/config/eventbus-topics.yaml
+++ b/config/eventbus-topics.yaml
@@ -29,6 +29,9 @@
 mediawiki.page-restrictions-change:
   schema_name: mediawiki/page/restrictions-change
 
+mediawiki.page-stable-revision-change:
+  schema_name: mediawiki/page/stable-revision-change
+
 mediawiki.revision-visibility-change:
   schema_name: mediawiki/revision/visibility-change
 
diff --git a/jsonschema/mediawiki/page/stable-revision-change/1.yaml 
b/jsonschema/mediawiki/page/stable-revision-change/1.yaml
new file mode 100644
index 000..4340736
--- /dev/null
+++ b/jsonschema/mediawiki/page/stable-revision-change/1.yaml
@@ -0,0 +1,140 @@
+title: mediawiki/page/stable-revision-change
+description: Represents a MW Page Stable Revision Change (Flagged Revisions).
+$schema: http://json-schema.org/draft-04/schema#
+type: object
+properties:
+  ### Meta data object.  All events schemas should have this.
+  meta:
+type: object
+properties:
+  topic:
+description: The queue topic name this message belongs to.
+type: string
+  schema_uri:
+description: >
+  The URI identifying the jsonschema for this event.  This may be just
+  a short uri containing only the name and revision at the end of the
+  URI path.  e.g. schema_name/12345 is acceptable.  This field
+  is not required.
+type: string
+  uri:
+description: The unique URI identifying the event.
+type: string
+format: uri
+  request_id:
+description: The unique UUID v1 ID of the event derived from the 
X-Request-Id header.
+type: string
+pattern: '^[a-fA-F0-9]{8}(-[a-fA-F0-9]{4}){3}-[a-fA-F0-9]{12}$'
+  id:
+description: The unique ID of this event; should match the dt field.
+type: string
+pattern: '^[a-fA-F0-9]{8}(-[a-fA-F0-9]{4}){3}-[a-fA-F0-9]{12}$'
+  dt:
+description: The time stamp of the event, in ISO8601 format.
+type: string
+format: date-time
+  domain:
+description: The domain the event pertains to.
+type: string
+required:
+  - topic
+  - uri
+  - id
+  - dt
+  - domain
+
+
+  ### Mediawiki entity fields.  All Mediawiki entity events should have these.
+  database:
+description: The name of the wiki database this event belongs to.
+type: string
+
+  performer:
+description: Represents the user that performed this change.
+type: object
+properties:
+  user_id:
+description: >
+  The user id that performed this change.  This is optional, and
+  will not be present for anonymous users.
+type: integer
+  user_text:
+description: The text representation of the user that performed this 
change.
+type: string
+  user_groups:
+description: A list of the groups this user belongs to.  E.g. bot, 
sysop etc.
+type: array
+items:
+  type: string
+  user_is_bot:
+description: >
+  True if this user is considered to be a bot.  This is checked
+  via the $user->isBot() method, which considers both user_groups
+  and user permissions.
+type: boolean
+  user_registration_dt:
+description: >
+  The datetime of the user account registration.
+  Not present for anonymous users or if missing in the MW database.
+type: string
+format: date-time
+  user_edit_count:
+description: >
+  The number of edits this user has made at the time this revision is 
created.
+  Not present for anonymous users.
+type: integer
+minimum: 0
+required:
+  - user_text
+  - user_groups
+  - user_is_bot
+
+  ### page entity fields - all page related events should have these.
+  page_id:
+description: The page ID of the page for which the stable revision has 
been changed.
+type: integer
+minimum: 1
+
+  page_title:
+description: The normalized title of the page.
+type: string
+
+  page_namespace:
+description: The namespace ID this page belongs to.
+type: integer
+
+

[MediaWiki-commits] [Gerrit] mediawiki...FlaggedRevs[master]: Add the FlaggedRevsStableRevisionUpdate hook

2017-09-26 Thread Mobrovac (Code Review)

Mobrovac has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/380805 )

Change subject: Add the FlaggedRevsStableRevisionUpdate hook
..

Add the FlaggedRevsStableRevisionUpdate hook

There are various ways and code paths that can cause a page's stable
revision to change (add/remove/update). Tracking this externally can be
rather tricky. Alas, the extension can determine exactly if/when
something changes, so have a hook that allows other parts of the system
to react to it.

The first use-case will be leveraging the hook to emit events in the
EventBus system that will enable RESTBase to track changes in flagged
revisions for titles and invalidate its caches accordingly.

Bug: T169116
Change-Id: I23f86a291e0dba9e81c03997b236c7fddd7c376f
---
M backend/FlaggedRevs.class.php
M docs/hooks.txt
2 files changed, 11 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/FlaggedRevs 
refs/changes/05/380805/1

diff --git a/backend/FlaggedRevs.class.php b/backend/FlaggedRevs.class.php
index 36ef149..cfb0b8e 100644
--- a/backend/FlaggedRevs.class.php
+++ b/backend/FlaggedRevs.class.php
@@ -676,6 +676,10 @@
self::purgeSquid( $title );
}
 
+   if ( $changed ) {
+   Hooks::run( 'FlaggedRevsStableRevisionUpdate', [ 
&$article, &$sv, &$oldSv ] );
+   }
+
return $changed;
}
 
diff --git a/docs/hooks.txt b/docs/hooks.txt
index f7c3b1f..fc7af3d 100644
--- a/docs/hooks.txt
+++ b/docs/hooks.txt
@@ -15,3 +15,10 @@
 $status: the status value generated from RevisionReviewForm::doSubmit. This is
 not a Status object but string or boolean value! 'true' on success, error
 message key on failure.
+
+'FlaggedRevsStableRevisionUpdate': When the stable revision of a page has been
+changed.
+$article: the FlaggableWikiPage for which the stable revision has changed
+$sv: the FlaggedRevision object that holds the current stable revision (can be
+null)
+$oldSv: the old FlaggedRevision object being replaced (can be null)

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I23f86a291e0dba9e81c03997b236c7fddd7c376f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/FlaggedRevs
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update restbase to df0d128

2017-09-26 Thread Mobrovac (Code Review)

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

Change subject: Update restbase to df0d128
..


Update restbase to df0d128

List of changes:
df0d128 Remove old mobileapps module

Change-Id: I3dcb11419e7041bbe291346a882e174241d967c8
---
M restbase
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Mobrovac: Verified; Looks good to me, approved



diff --git a/restbase b/restbase
index e32ca50..df0d128 16
--- a/restbase
+++ b/restbase
@@ -1 +1 @@
-Subproject commit e32ca50eb988e7b0936d50f4bb492fd4f6937e7e
+Subproject commit df0d1280153382e57827cba1de64fcfabeb74a98

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3dcb11419e7041bbe291346a882e174241d967c8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/restbase/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 
Gerrit-Reviewer: Mobrovac 

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update restbase to df0d128

2017-09-26 Thread Mobrovac (Code Review)

Mobrovac has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/380752 )

Change subject: Update restbase to df0d128
..

Update restbase to df0d128

List of changes:
df0d128 Remove old mobileapps module

Change-Id: I3dcb11419e7041bbe291346a882e174241d967c8
---
M restbase
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/restbase/deploy 
refs/changes/52/380752/1

diff --git a/restbase b/restbase
index e32ca50..df0d128 16
--- a/restbase
+++ b/restbase
@@ -1 +1 @@
-Subproject commit e32ca50eb988e7b0936d50f4bb492fd4f6937e7e
+Subproject commit df0d1280153382e57827cba1de64fcfabeb74a98

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3dcb11419e7041bbe291346a882e174241d967c8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/restbase/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 

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

[MediaWiki-commits] [Gerrit] mediawiki...jobqueue-deploy[master]: Revert "[Config] Annotate the job event with pipeline proper...

2017-09-26 Thread Mobrovac (Code Review)

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

Change subject: Revert "[Config] Annotate the job event with pipeline property."
..


Revert "[Config] Annotate the job event with pipeline property."

This reverts commit 354a5d4e2ab9f71f2e3db4aaceb9ad674676e134.

Bug: T175637
Change-Id: Ia18721a1730b97908f8a6fdf260b4c21310766fb
---
M scap/templates/config.yaml.j2
1 file changed, 1 insertion(+), 9 deletions(-)

Approvals:
  Mobrovac: Verified; Looks good to me, approved



diff --git a/scap/templates/config.yaml.j2 b/scap/templates/config.yaml.j2
index 94004ac..057746e 100644
--- a/scap/templates/config.yaml.j2
+++ b/scap/templates/config.yaml.j2
@@ -40,15 +40,7 @@
   uri: '<%= jobrunner_uri %>'
   headers:
 content-type: 'application/json'
-  # Temporary so that we could add a 'pipeline' property to 
the params.
-  body:
-database: '{{message.database}}'
-meta: '{{message.meta}}'
-page_namespace: '{{message.page_namespace}}'
-page_title: '{{message.page_title}}'
-params: '{{merge(message.params, {"pipeline": 
"EventBus"})}}'
-sha1: '{{message.sha1}}'
-type: '{{message.type}}'
+  body: '{{globals.message}}'
 
 
 # Number of worker processes to spawn.

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia18721a1730b97908f8a6fdf260b4c21310766fb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/change-propagation/jobqueue-deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 
Gerrit-Reviewer: Mobrovac 
Gerrit-Reviewer: Ppchelko 

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

[MediaWiki-commits] [Gerrit] mediawiki...jobqueue-deploy[master]: Revert "[Config] Annotate the job event with pipeline proper...

2017-09-25 Thread Mobrovac (Code Review)

Mobrovac has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/380548 )

Change subject: Revert "[Config] Annotate the job event with pipeline property."
..

Revert "[Config] Annotate the job event with pipeline property."

This reverts commit 354a5d4e2ab9f71f2e3db4aaceb9ad674676e134.

Bug: T175637
Change-Id: Ia18721a1730b97908f8a6fdf260b4c21310766fb
---
M scap/templates/config.yaml.j2
1 file changed, 1 insertion(+), 9 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/services/change-propagation/jobqueue-deploy
 refs/changes/48/380548/1

diff --git a/scap/templates/config.yaml.j2 b/scap/templates/config.yaml.j2
index 94004ac..057746e 100644
--- a/scap/templates/config.yaml.j2
+++ b/scap/templates/config.yaml.j2
@@ -40,15 +40,7 @@
   uri: '<%= jobrunner_uri %>'
   headers:
 content-type: 'application/json'
-  # Temporary so that we could add a 'pipeline' property to 
the params.
-  body:
-database: '{{message.database}}'
-meta: '{{message.meta}}'
-page_namespace: '{{message.page_namespace}}'
-page_title: '{{message.page_title}}'
-params: '{{merge(message.params, {"pipeline": 
"EventBus"})}}'
-sha1: '{{message.sha1}}'
-type: '{{message.type}}'
+  body: '{{globals.message}}'
 
 
 # Number of worker processes to spawn.

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia18721a1730b97908f8a6fdf260b4c21310766fb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/change-propagation/jobqueue-deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Revert "[Logging config] Enable logging for updateBetaFeatur...

2017-09-25 Thread Mobrovac (Code Review)

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

Change subject: Revert "[Logging config] Enable logging for 
updateBetaFeaturesUserCounts"
..


Revert "[Logging config] Enable logging for updateBetaFeaturesUserCounts"

This reverts commit 4cd633ec16c5ec7611e07887b0e75d0d3b410a4a.

Change-Id: I16fedaa856db060d006120a0f03c7fd755e8dd8b
---
M wmf-config/InitialiseSettings.php
1 file changed, 0 insertions(+), 1 deletion(-)

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 42ca632..af275dd 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -5226,7 +5226,6 @@
'torblock' => 'debug',
'ts_badpass' => 'debug',
'UpdateRepo' => 'debug',
-   'updateBetaFeaturesUserCounts' => 'info', // T175637
'updateTranstagOnNullRevisions' => 'debug',
'upload' => 'debug',
'wfLogDBError' => 'debug', // Former $wgDBerrorLog

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I16fedaa856db060d006120a0f03c7fd755e8dd8b
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Ppchelko 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Mobrovac 
Gerrit-Reviewer: Urbanecm 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Config: Purge the latest HTML route for FlaggedRevs cache up...

2017-09-25 Thread Mobrovac (Code Review)

Mobrovac has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/380540 )

Change subject: Config: Purge the latest HTML route for FlaggedRevs cache 
updates
..

Config: Purge the latest HTML route for FlaggedRevs cache updates

Bug: T169116
Change-Id: I916c82076d9f2c24811ba07edd4d3c133199f68a
---
M scap/templates/config.yaml.j2
1 file changed, 15 insertions(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/services/change-propagation/deploy 
refs/changes/40/380540/1

diff --git a/scap/templates/config.yaml.j2 b/scap/templates/config.yaml.j2
index 2a1a23a..a46131d 100644
--- a/scap/templates/config.yaml.j2
+++ b/scap/templates/config.yaml.j2
@@ -141,6 +141,21 @@
 - meta:
 uri: 
'//{{message.meta.domain}}/api/rest_v1/{{match.meta.uri.title}}'
 
+  purge_varnish_for_flagged:
+topic: mediawiki.job.flaggedrevs_CacheUpdate
+match:
+  meta:
+uri: '/^https?:\/\/[^\/]+\/api\/rest_v1\/(?.+)$/'
+match_not:
+  meta:
+domain: /\.wikidata\.org$/
+exec:
+  method: post
+  uri: '/sys/purge/'
+  body:
+- meta:
+uri: 
'//{{message.meta.domain}}/api/rest_v1/{{match.meta.uri.title}}'
+
   # RESTBase update jobs
   mw_purge:
 topic: resource_change

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I916c82076d9f2c24811ba07edd4d3c133199f68a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/change-propagation/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update restbase to e32ca50

2017-09-25 Thread Mobrovac (Code Review)

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

Change subject: Update restbase to e32ca50
..


Update restbase to e32ca50

List of changes:
ed4e8ad Fix tavis build (#866)
a560ab5 Travis: Drop Node v4, add Node v8
b5f0a2a Do not cache feeds for the current day inn cassandra
e32ca50 removed TTL from the options

Change-Id: I5382a996e3ab28f7f475109460bd17eb2aabe1d8
---
M restbase
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Mobrovac: Verified; Looks good to me, approved



diff --git a/restbase b/restbase
index 21c2af1..e32ca50 16
--- a/restbase
+++ b/restbase
@@ -1 +1 @@
-Subproject commit 21c2af16322efa2d56aa4b92243e954f8d4409be
+Subproject commit e32ca50eb988e7b0936d50f4bb492fd4f6937e7e

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5382a996e3ab28f7f475109460bd17eb2aabe1d8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/restbase/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 
Gerrit-Reviewer: Mobrovac 

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update restbase to e32ca50

2017-09-25 Thread Mobrovac (Code Review)

Mobrovac has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/380445 )

Change subject: Update restbase to e32ca50
..

Update restbase to e32ca50

List of changes:
ed4e8ad Fix tavis build (#866)
a560ab5 Travis: Drop Node v4, add Node v8
b5f0a2a Do not cache feeds for the current day inn cassandra
e32ca50 removed TTL from the options

Change-Id: I5382a996e3ab28f7f475109460bd17eb2aabe1d8
---
M restbase
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/restbase/deploy 
refs/changes/45/380445/1

diff --git a/restbase b/restbase
index 21c2af1..e32ca50 16
--- a/restbase
+++ b/restbase
@@ -1 +1 @@
-Subproject commit 21c2af16322efa2d56aa4b92243e954f8d4409be
+Subproject commit e32ca50eb988e7b0936d50f4bb492fd4f6937e7e

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5382a996e3ab28f7f475109460bd17eb2aabe1d8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/restbase/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: MobileApps: Switch to using the next-gen storage only

2017-09-25 Thread Mobrovac (Code Review)

Mobrovac has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/380443 )

Change subject: MobileApps: Switch to using the next-gen storage only
..

MobileApps: Switch to using the next-gen storage only

Bug: T169940
Change-Id: I8b5965419d22c0ae5cee3937c87a6bb6e39f8be6
---
M scap/templates/config.yaml.j2
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/restbase/deploy 
refs/changes/43/380443/1

diff --git a/scap/templates/config.yaml.j2 b/scap/templates/config.yaml.j2
index 568bacc..5619db0 100644
--- a/scap/templates/config.yaml.j2
+++ b/scap/templates/config.yaml.j2
@@ -108,7 +108,7 @@
   cache-control: s-maxage=864000, max-age=86400
 mobileapps:
   host: <%= mobileapps_uri %>
-  storage: both
+  storage: new
 citoid:
   host: <%= citoid_uri %>
 recommendation:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8b5965419d22c0ae5cee3937c87a6bb6e39f8be6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/restbase/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update restbase to 21c2af1

2017-09-21 Thread Mobrovac (Code Review)

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

Change subject: Update restbase to 21c2af1
..


Update restbase to 21c2af1

List of changes:
58ea43d Mobile Proxy: Produce the diff if there is a body mismatch

Change-Id: I7d11f91eda7f1d6245ff394a86b673b5edb3056d
---
M restbase
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Mobrovac: Verified; Looks good to me, approved



diff --git a/restbase b/restbase
index 966453a..21c2af1 16
--- a/restbase
+++ b/restbase
@@ -1 +1 @@
-Subproject commit 966453a98b6e46a56efe29cd5185e06dba37079b
+Subproject commit 21c2af16322efa2d56aa4b92243e954f8d4409be

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7d11f91eda7f1d6245ff394a86b673b5edb3056d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/restbase/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 
Gerrit-Reviewer: Mobrovac 

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update restbase to 21c2af1

2017-09-21 Thread Mobrovac (Code Review)

Mobrovac has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/379519 )

Change subject: Update restbase to 21c2af1
..

Update restbase to 21c2af1

List of changes:
58ea43d Mobile Proxy: Produce the diff if there is a body mismatch

Change-Id: I7d11f91eda7f1d6245ff394a86b673b5edb3056d
---
M restbase
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/restbase/deploy 
refs/changes/19/379519/1

diff --git a/restbase b/restbase
index 966453a..21c2af1 16
--- a/restbase
+++ b/restbase
@@ -1 +1 @@
-Subproject commit 966453a98b6e46a56efe29cd5185e06dba37079b
+Subproject commit 21c2af16322efa2d56aa4b92243e954f8d4409be

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7d11f91eda7f1d6245ff394a86b673b5edb3056d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/restbase/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Config: State explicitly to use both buckets for MobileApps

2017-09-21 Thread Mobrovac (Code Review)

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

Change subject: Config: State explicitly to use both buckets for MobileApps
..


Config: State explicitly to use both buckets for MobileApps

`both` is the default, but let's have it explicitly listed here so that
in case we need to change it, it's easy to do so.

Change-Id: I7513169a0a5807ce10669febd95dddc492f61164
---
M scap/templates/config.yaml.j2
1 file changed, 1 insertion(+), 0 deletions(-)

Approvals:
  Mobrovac: Verified; Looks good to me, approved



diff --git a/scap/templates/config.yaml.j2 b/scap/templates/config.yaml.j2
index 40144c9..568bacc 100644
--- a/scap/templates/config.yaml.j2
+++ b/scap/templates/config.yaml.j2
@@ -108,6 +108,7 @@
   cache-control: s-maxage=864000, max-age=86400
 mobileapps:
   host: <%= mobileapps_uri %>
+  storage: both
 citoid:
   host: <%= citoid_uri %>
 recommendation:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7513169a0a5807ce10669febd95dddc492f61164
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/restbase/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 
Gerrit-Reviewer: Mobrovac 
Gerrit-Reviewer: Ppchelko 

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Config: State explicitly to use both buckets for MobileApps

2017-09-21 Thread Mobrovac (Code Review)

Mobrovac has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/379497 )

Change subject: Config: State explicitly to use both buckets for MobileApps
..

Config: State explicitly to use both buckets for MobileApps

`both` is the default, but let's have it explicitly listed here so that
in case we need to change it, it's easy to do so.

Change-Id: I7513169a0a5807ce10669febd95dddc492f61164
---
M scap/templates/config.yaml.j2
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/restbase/deploy 
refs/changes/97/379497/1

diff --git a/scap/templates/config.yaml.j2 b/scap/templates/config.yaml.j2
index 40144c9..568bacc 100644
--- a/scap/templates/config.yaml.j2
+++ b/scap/templates/config.yaml.j2
@@ -108,6 +108,7 @@
   cache-control: s-maxage=864000, max-age=86400
 mobileapps:
   host: <%= mobileapps_uri %>
+  storage: both
 citoid:
   host: <%= citoid_uri %>
 recommendation:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7513169a0a5807ce10669febd95dddc492f61164
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/restbase/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update restbase to 966453a

2017-09-21 Thread Mobrovac (Code Review)

Mobrovac has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/379496 )

Change subject: Update restbase to 966453a
..

Update restbase to 966453a

List of changes:
966453a Only compare the content for no-cache requests

Change-Id: Ie920f8d34270c62594c057255775b3b165deebe1
---
M restbase
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/restbase/deploy 
refs/changes/96/379496/1

diff --git a/restbase b/restbase
index 2e78690..966453a 16
--- a/restbase
+++ b/restbase
@@ -1 +1 @@
-Subproject commit 2e786907737aabb09a9ee44841e1eed121e89c00
+Subproject commit 966453a98b6e46a56efe29cd5185e06dba37079b

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie920f8d34270c62594c057255775b3b165deebe1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/restbase/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update restbase to 966453a

2017-09-21 Thread Mobrovac (Code Review)

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

Change subject: Update restbase to 966453a
..


Update restbase to 966453a

List of changes:
966453a Only compare the content for no-cache requests

Change-Id: Ie920f8d34270c62594c057255775b3b165deebe1
---
M restbase
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Mobrovac: Verified; Looks good to me, approved



diff --git a/restbase b/restbase
index 2e78690..966453a 16
--- a/restbase
+++ b/restbase
@@ -1 +1 @@
-Subproject commit 2e786907737aabb09a9ee44841e1eed121e89c00
+Subproject commit 966453a98b6e46a56efe29cd5185e06dba37079b

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie920f8d34270c62594c057255775b3b165deebe1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/restbase/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 
Gerrit-Reviewer: Mobrovac 

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update restbase to 2e78690

2017-09-21 Thread Mobrovac (Code Review)

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

Change subject: Update restbase to 2e78690
..


Update restbase to 2e78690

List of changes:
2e78690 Make sure schema changes are applied sequentially

Change-Id: I2ee3a9ebbd6b34363b50d9d17a333c43749312c5
---
M restbase
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Mobrovac: Verified; Looks good to me, approved



diff --git a/restbase b/restbase
index ee45c48..2e78690 16
--- a/restbase
+++ b/restbase
@@ -1 +1 @@
-Subproject commit ee45c48468c88cb2cf92e8cafdf921082da8be06
+Subproject commit 2e786907737aabb09a9ee44841e1eed121e89c00

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2ee3a9ebbd6b34363b50d9d17a333c43749312c5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/restbase/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 
Gerrit-Reviewer: Mobrovac 

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update restbase to 2e78690

2017-09-21 Thread Mobrovac (Code Review)

Mobrovac has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/379477 )

Change subject: Update restbase to 2e78690
..

Update restbase to 2e78690

List of changes:
2e78690 Make sure schema changes are applied sequentially

Change-Id: I2ee3a9ebbd6b34363b50d9d17a333c43749312c5
---
M restbase
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/restbase/deploy 
refs/changes/77/379477/1

diff --git a/restbase b/restbase
index ee45c48..2e78690 16
--- a/restbase
+++ b/restbase
@@ -1 +1 @@
-Subproject commit ee45c48468c88cb2cf92e8cafdf921082da8be06
+Subproject commit 2e786907737aabb09a9ee44841e1eed121e89c00

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2ee3a9ebbd6b34363b50d9d17a333c43749312c5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/restbase/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Cassandra: Allow extra hosts to access the cluster via CQL

2017-09-20 Thread Mobrovac (Code Review)

Mobrovac has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/379223 )

Change subject: Cassandra: Allow extra hosts to access the cluster via CQL
..

Cassandra: Allow extra hosts to access the cluster via CQL

RESTBase is transitioning from Cassandra 2 to Cassandra 3 with a new
storage model, so we now have two clusters that accessed by RESTBase.
This patch (aka hack) allows the RESTBase nodes to access the CQL
interface of Cassandra 3 hosts.

Bug: T169940
Change-Id: Ieb32fd261783cffc37f90e033682b5d4238c4c08
---
M hieradata/role/common/restbase/production_ng.yaml
M modules/profile/manifests/cassandra.pp
2 files changed, 37 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/23/379223/1

diff --git a/hieradata/role/common/restbase/production_ng.yaml 
b/hieradata/role/common/restbase/production_ng.yaml
index 7c8c7e2..def9c38 100644
--- a/hieradata/role/common/restbase/production_ng.yaml
+++ b/hieradata/role/common/restbase/production_ng.yaml
@@ -5,6 +5,25 @@
 #
 graphite_host: 'graphite1003.eqiad.wmnet'
 profile::cassandra::allow_analytics: false
+profile::cassandra::extra_cql_hosts:
+  - restbase1007.eqiad.wmnet
+  - restbase1011.eqiad.wmnet
+  - restbase1012.eqiad.wmnet
+  - restbase1013.eqiad.wmnet
+  - restbase1014.eqiad.wmnet
+  - restbase1015.eqiad.wmnet
+  - restbase1016.eqiad.wmnet
+  - restbase1017.eqiad.wmnet
+  - restbase1018.eqiad.wmnet
+  - restbase2002.eqiad.wmnet
+  - restbase2004.eqiad.wmnet
+  - restbase2006.eqiad.wmnet
+  - restbase2007.eqiad.wmnet
+  - restbase2008.eqiad.wmnet
+  - restbase2009.eqiad.wmnet
+  - restbase2010.eqiad.wmnet
+  - restbase2011.eqiad.wmnet
+  - restbase2012.eqiad.wmnet
 
 profile::cassandra::metrics_whitelist:
   - 
.*\.metrics\.ColumnFamily\.local_group_.*\.meta\.CoordinatorReadLatency\..*$
diff --git a/modules/profile/manifests/cassandra.pp 
b/modules/profile/manifests/cassandra.pp
index 217724d..ed7ebab 100644
--- a/modules/profile/manifests/cassandra.pp
+++ b/modules/profile/manifests/cassandra.pp
@@ -98,11 +98,27 @@
 port   => '7199:7202',
 srange => "@resolve((${cassandra_hosts_ferm}))",
 }
+# XXX TEMP XXX
+# RESTBase is currently migrating from Cass 2 to Cass 3 by gradually
+# switching use-cases from one to the other, which means that there
+# are currently two Cassandra clusters being used by RESTBase. However,
+# we are running RESTBase only on nodes with Cassandra 2. In this hack
+# we are allowing the RESTBase hosts to talk to Cassandra 3.x nodes.
+$extra_cql_hosts = hiera('profile::cassandra::extra_cql_hosts', [])
+unless empty($extra_cql_hosts) {
+$extra_cql_ferm = join($extra_cql_hosts, ' ')
+$srange_cql = "${cassandra_hosts_ferm} ${extra_cql_ferm}"
+} else {
+$srange_cql = $cassandra_hosts_ferm
+}
+# Note: all of the $srange_cql instances below need to be replaced back to
+# $cassandra_hosts_ferm once this hack is no longer needed
+# XXX END TEMP XXX
 # Cassandra CQL query interface
 ferm::service { 'cassandra-cql':
 proto  => 'tcp',
 port   => '9042',
-srange => "@resolve((${cassandra_hosts_ferm}))",
+srange => "@resolve((${srange_cql}))",
 }
 # Prometheus jmx_exporter for Cassandra
 ferm::service { 'cassandra-jmx_exporter':
@@ -116,7 +132,7 @@
 ferm::service { 'cassandra-analytics-cql':
 proto  => 'tcp',
 port   => '9042',
-srange => "(@resolve((${cassandra_hosts_ferm})) 
${analytics_networks})",
+srange => "(@resolve((${srange_cql})) ${analytics_networks})",
 }
 
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ieb32fd261783cffc37f90e033682b5d4238c4c08
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mobrovac 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: RESTBase: Separate eqiad and codfw seeds

2017-09-20 Thread Mobrovac (Code Review)

Mobrovac has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/379217 )

Change subject: RESTBase: Separate eqiad and codfw seeds
..

RESTBase: Separate eqiad and codfw seeds

For the new storage schema, we need the list of Cassandra 3.x seeds for
RESTBase to be separated by DC.

Bug: T169940
Change-Id: Ic497931c6c49d5135ee90e777a3109e27d84bb4a
---
M hieradata/role/codfw/restbase/production.yaml
M hieradata/role/common/restbase/production.yaml
M hieradata/role/eqiad/restbase/production.yaml
3 files changed, 20 insertions(+), 19 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/17/379217/1

diff --git a/hieradata/role/codfw/restbase/production.yaml 
b/hieradata/role/codfw/restbase/production.yaml
index 0ce4ace..e1c7ae6 100644
--- a/hieradata/role/codfw/restbase/production.yaml
+++ b/hieradata/role/codfw/restbase/production.yaml
@@ -5,6 +5,16 @@
   - restbase2007-a.codfw.wmnet
   - restbase2007-b.codfw.wmnet
   - restbase2007-c.codfw.wmnet
+profile::restbase::seeds_ng:
+  - restbase2001-a.codfw.wmnet
+  - restbase2001-b.codfw.wmnet
+  - restbase2001-c.codfw.wmnet
+  - restbase2003-a.codfw.wmnet
+  - restbase2003-b.codfw.wmnet
+  - restbase2003-c.codfw.wmnet
+  - restbase2005-a.codfw.wmnet
+  - restbase2005-b.codfw.wmnet
+  - restbase2005-c.codfw.wmnet
 # used for rate limiting
 profile::restbase::hosts:
   - restbase2002.codfw.wmnet
diff --git a/hieradata/role/common/restbase/production.yaml 
b/hieradata/role/common/restbase/production.yaml
index 6a89f92..c6a9b5d 100644
--- a/hieradata/role/common/restbase/production.yaml
+++ b/hieradata/role/common/restbase/production.yaml
@@ -23,25 +23,6 @@
 profile::restbase::monitor_domain: en.wikipedia.org
 profile::restbase::cassandra_tls:
   ca: /dev/null
-profile::restbase::seeds_ng:
-  - restbase2001-a.codfw.wmnet
-  - restbase2001-b.codfw.wmnet
-  - restbase2001-c.codfw.wmnet
-  - restbase2003-a.codfw.wmnet
-  - restbase2003-b.codfw.wmnet
-  - restbase2003-c.codfw.wmnet
-  - restbase2005-a.codfw.wmnet
-  - restbase2005-b.codfw.wmnet
-  - restbase2005-c.codfw.wmnet
-  - restbase1008-a.eqiad.wmnet
-  - restbase1008-b.eqiad.wmnet
-  - restbase1008-c.eqiad.wmnet
-  - restbase1009-a.eqiad.wmnet
-  - restbase1009-b.eqiad.wmnet
-  - restbase1009-c.eqiad.wmnet
-  - restbase1010-a.eqiad.wmnet
-  - restbase1010-b.eqiad.wmnet
-  - restbase1010-c.eqiad.wmnet
 
 #
 # Cassandra
diff --git a/hieradata/role/eqiad/restbase/production.yaml 
b/hieradata/role/eqiad/restbase/production.yaml
index b3b662e..9f6ddb8 100644
--- a/hieradata/role/eqiad/restbase/production.yaml
+++ b/hieradata/role/eqiad/restbase/production.yaml
@@ -7,6 +7,16 @@
   - restbase1012-b.eqiad.wmnet
   - restbase1013-a.eqiad.wmnet
   - restbase1013-b.eqiad.wmnet
+profile::restbase::seeds_ng:
+  - restbase1008-a.eqiad.wmnet
+  - restbase1008-b.eqiad.wmnet
+  - restbase1008-c.eqiad.wmnet
+  - restbase1009-a.eqiad.wmnet
+  - restbase1009-b.eqiad.wmnet
+  - restbase1009-c.eqiad.wmnet
+  - restbase1010-a.eqiad.wmnet
+  - restbase1010-b.eqiad.wmnet
+  - restbase1010-c.eqiad.wmnet
 # used for rate limiting
 profile::restbase::hosts:
   - restbase1007.eqiad.wmnet

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic497931c6c49d5135ee90e777a3109e27d84bb4a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mobrovac 

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Config: Add the table_ng options and new storage groups

2017-09-20 Thread Mobrovac (Code Review)

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

Change subject: Config: Add the table_ng options and new storage groups
..


Config: Add the table_ng options and new storage groups

Bug: T169940
Bug: T172224
Change-Id: I9e23fba5942f6ca8b4de55c7b604e1e35f38a309
---
M scap/environments/beta/vars.yaml
M scap/templates/config.yaml.j2
M scap/vars.yaml
3 files changed, 32 insertions(+), 1 deletion(-)

Approvals:
  Eevans: Looks good to me, but someone else must approve
  Mobrovac: Verified; Looks good to me, approved
  GWicke: Looks good to me, but someone else must approve
  Ppchelko: Looks good to me, but someone else must approve



diff --git a/scap/environments/beta/vars.yaml b/scap/environments/beta/vars.yaml
index 44429cd..80069e9 100644
--- a/scap/environments/beta/vars.yaml
+++ b/scap/environments/beta/vars.yaml
@@ -2,6 +2,7 @@
 page_size: 10
 user_agent: RESTBase/deployment-prep
 storage_groups: []
+storage_groups_ng: []
 cassandra_default_consistency: localOne
 domains:
   BetaCluster:
diff --git a/scap/templates/config.yaml.j2 b/scap/templates/config.yaml.j2
index a60f575..40144c9 100644
--- a/scap/templates/config.yaml.j2
+++ b/scap/templates/config.yaml.j2
@@ -74,6 +74,27 @@
 # Catch-all group
 - name: default.group.local
   domains: /./
+table_ng:
+  backend: cassandra-ng
+  hosts: ['<%= seeds_ng|join("','") if seeds_ng|length > 0 else 
seeds|join("','") %>']
+  keyspace: system
+  localDc: <%= cassandra_local_dc %>
+  datacenters: ['<%= cassandra_datacenters|join("','") %>']
+  username: <%= cassandra_user %>
+  password: <%= cassandra_password %>
+  defaultConsistency: <%= cassandra_default_consistency %>
+  <% if cassandra_tls is not none and cassandra_tls|length > 0 
%>tls:<% for key, value in cassandra_tls.iteritems() %>
+<%= key %>: <%= value -%>
+<% endfor -%>
+<% endif %>
+  storage_groups:
+  <%- for group in storage_groups_ng %>
+- name: <%= group.name %>
+  domains: <%= group.domains %>
+  <%- endfor %>
+# Catch-all group
+- name: others
+  domains: /./
 parsoid:
   host: <%= parsoid_uri %>
 action:
@@ -197,4 +218,4 @@
   user_agent: <%= user_agent %>
   ui_name: RESTBase
   ui_url: https://www.mediawiki.org/wiki/RESTBase
-  ui_title: RESTBase docs
\ No newline at end of file
+  ui_title: RESTBase docs
diff --git a/scap/vars.yaml b/scap/vars.yaml
index bf0c5d4..870caa0 100644
--- a/scap/vars.yaml
+++ b/scap/vars.yaml
@@ -57,6 +57,15 @@
 domains: /\.wikivoyage\.org$/
   - name: globaldomain.group.local
 domains: /^wikimedia\.org$/
+storage_groups_ng:
+  - name: enwiki
+domains: /^en\.wikipedia\.org$/
+  - name: commons
+domains: /^commons\.wikimedia\.org$/
+  - name: globaldomain
+domains: /^wikimedia\.org$/
+  - name: wikipedia
+domains: /\.wikipedia\.org$/
 domains:
   Wikipedia:
 ab.wikipedia.org: default_project

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9e23fba5942f6ca8b4de55c7b604e1e35f38a309
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/services/restbase/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 
Gerrit-Reviewer: Eevans 
Gerrit-Reviewer: GWicke 
Gerrit-Reviewer: Mobrovac 
Gerrit-Reviewer: Ppchelko 

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update restbase to ee45c48

2017-09-20 Thread Mobrovac (Code Review)

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

Change subject: Update restbase to ee45c48
..


Update restbase to ee45c48

List of changes:
d04824f Fix sandbox URL in README.md
76fbd68 Summary: Fix: Switch to HTTPS for the `original` field as well
b4a781d Separate mobileapps switch to the new bucket
6a9d247 Removed the parsoid_bucket for now
fc14516 Renamed time_to_live to grace_ttl
a6452a9 Respect the table prefix for timelines
89dd712 Create a kill switch for the new storage
ee45c48 Release v0.17.0
xxx Update node module dependencies

Change-Id: Ibc4eb19cbd4f852aee6c06429dbf8f8c88971237
---
M node_modules/assert-plus/assert.js
M node_modules/assert-plus/package.json
M node_modules/aws-sign2/index.js
M node_modules/aws-sign2/package.json
M node_modules/aws4/package.json
M node_modules/bluebird/package.json
D node_modules/boom/.travis.yml
M node_modules/boom/LICENSE
D node_modules/boom/images/boom.png
M node_modules/boom/lib/index.js
M node_modules/boom/package.json
D node_modules/boom/test/index.js
M node_modules/cassandra-driver/package.json
M node_modules/cassandra-uuid/package.json
M node_modules/content-type/package.json
M node_modules/core-js/LICENSE
M node_modules/core-js/bower.json
M node_modules/core-js/build/build.ls
M node_modules/core-js/build/index.js
M node_modules/core-js/client/core.js
M node_modules/core-js/client/core.min.js
M node_modules/core-js/client/core.min.js.map
M node_modules/core-js/client/library.js
M node_modules/core-js/client/library.min.js
M node_modules/core-js/client/library.min.js.map
M node_modules/core-js/client/shim.js
M node_modules/core-js/client/shim.min.js
M node_modules/core-js/client/shim.min.js.map
M node_modules/core-js/fn/array/virtual/iterator.js
M node_modules/core-js/fn/array/virtual/values.js
M node_modules/core-js/fn/string/virtual/iterator.js
M node_modules/core-js/library/fn/array/virtual/iterator.js
M node_modules/core-js/library/fn/array/virtual/values.js
M node_modules/core-js/library/fn/string/virtual/iterator.js
M node_modules/core-js/library/modules/_core.js
M node_modules/core-js/library/modules/_promise-resolve.js
M node_modules/core-js/library/modules/es6.promise.js
M node_modules/core-js/library/modules/es6.symbol.js
M node_modules/core-js/library/modules/web.timers.js
M node_modules/core-js/modules/_core.js
M node_modules/core-js/modules/_promise-resolve.js
M node_modules/core-js/modules/es6.promise.js
M node_modules/core-js/modules/es6.symbol.js
M node_modules/core-js/modules/web.timers.js
M node_modules/core-js/package.json
M node_modules/cryptiles/.npmignore
D node_modules/cryptiles/.travis.yml
M node_modules/cryptiles/LICENSE
M node_modules/cryptiles/lib/index.js
A node_modules/cryptiles/node_modules/boom/LICENSE
A node_modules/cryptiles/node_modules/boom/lib/index.js
A node_modules/cryptiles/node_modules/boom/package.json
M node_modules/cryptiles/package.json
D node_modules/cryptiles/test/index.js
D node_modules/dashdash/node_modules/assert-plus/AUTHORS
D node_modules/dashdash/node_modules/assert-plus/assert.js
D node_modules/dashdash/node_modules/assert-plus/package.json
M node_modules/extend/package.json
A node_modules/fast-deep-equal/.eslintrc.yml
A node_modules/fast-deep-equal/.npmignore
A node_modules/fast-deep-equal/.travis.yml
A node_modules/fast-deep-equal/LICENSE
A node_modules/fast-deep-equal/benchmark/.eslintrc.yml
A node_modules/fast-deep-equal/benchmark/index.js
A node_modules/fast-deep-equal/index.js
A node_modules/fast-deep-equal/package.json
A node_modules/fast-deep-equal/spec/.eslintrc.yml
A node_modules/fast-deep-equal/spec/index.spec.js
A node_modules/fast-deep-equal/spec/tests.js
A node_modules/form-data/README.md.bak
M node_modules/form-data/lib/form_data.js
M node_modules/form-data/package.json
D node_modules/getpass/node_modules/assert-plus/AUTHORS
D node_modules/getpass/node_modules/assert-plus/assert.js
D node_modules/getpass/node_modules/assert-plus/package.json
M node_modules/har-schema/lib/afterRequest.json
M node_modules/har-schema/lib/beforeRequest.json
M node_modules/har-schema/lib/browser.json
M node_modules/har-schema/lib/cache.json
M node_modules/har-schema/lib/content.json
M node_modules/har-schema/lib/cookie.json
M node_modules/har-schema/lib/creator.json
M node_modules/har-schema/lib/entry.json
M node_modules/har-schema/lib/har.json
M node_modules/har-schema/lib/header.json
M node_modules/har-schema/lib/log.json
M node_modules/har-schema/lib/page.json
M node_modules/har-schema/lib/pageTimings.json
M node_modules/har-schema/lib/postData.json
M node_modules/har-schema/lib/query.json
M node_modules/har-schema/lib/request.json
M node_modules/har-schema/lib/response.json
M node_modules/har-schema/lib/timings.json
M node_modules/har-schema/package.json
A node_modules/har-validator/lib/async.js
D node_modules/har-validator/lib/browser/async.js
D

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update restbase to ee45c48

2017-09-20 Thread Mobrovac (Code Review)

Mobrovac has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/379208 )

Change subject: Update restbase to ee45c48
..

Update restbase to ee45c48

List of changes:
d04824f Fix sandbox URL in README.md
76fbd68 Summary: Fix: Switch to HTTPS for the `original` field as well
b4a781d Separate mobileapps switch to the new bucket
6a9d247 Removed the parsoid_bucket for now
fc14516 Renamed time_to_live to grace_ttl
a6452a9 Respect the table prefix for timelines
89dd712 Create a kill switch for the new storage
ee45c48 Release v0.17.0
xxx Update node module dependencies

Change-Id: Ibc4eb19cbd4f852aee6c06429dbf8f8c88971237
---
M node_modules/assert-plus/assert.js
M node_modules/assert-plus/package.json
M node_modules/aws-sign2/index.js
M node_modules/aws-sign2/package.json
M node_modules/aws4/package.json
M node_modules/bluebird/package.json
D node_modules/boom/.travis.yml
M node_modules/boom/LICENSE
D node_modules/boom/images/boom.png
M node_modules/boom/lib/index.js
M node_modules/boom/package.json
D node_modules/boom/test/index.js
M node_modules/cassandra-driver/package.json
M node_modules/cassandra-uuid/package.json
M node_modules/content-type/package.json
M node_modules/core-js/LICENSE
M node_modules/core-js/bower.json
M node_modules/core-js/build/build.ls
M node_modules/core-js/build/index.js
M node_modules/core-js/client/core.js
M node_modules/core-js/client/core.min.js
M node_modules/core-js/client/core.min.js.map
M node_modules/core-js/client/library.js
M node_modules/core-js/client/library.min.js
M node_modules/core-js/client/library.min.js.map
M node_modules/core-js/client/shim.js
M node_modules/core-js/client/shim.min.js
M node_modules/core-js/client/shim.min.js.map
M node_modules/core-js/fn/array/virtual/iterator.js
M node_modules/core-js/fn/array/virtual/values.js
M node_modules/core-js/fn/string/virtual/iterator.js
M node_modules/core-js/library/fn/array/virtual/iterator.js
M node_modules/core-js/library/fn/array/virtual/values.js
M node_modules/core-js/library/fn/string/virtual/iterator.js
M node_modules/core-js/library/modules/_core.js
M node_modules/core-js/library/modules/_promise-resolve.js
M node_modules/core-js/library/modules/es6.promise.js
M node_modules/core-js/library/modules/es6.symbol.js
M node_modules/core-js/library/modules/web.timers.js
M node_modules/core-js/modules/_core.js
M node_modules/core-js/modules/_promise-resolve.js
M node_modules/core-js/modules/es6.promise.js
M node_modules/core-js/modules/es6.symbol.js
M node_modules/core-js/modules/web.timers.js
M node_modules/core-js/package.json
M node_modules/cryptiles/.npmignore
D node_modules/cryptiles/.travis.yml
M node_modules/cryptiles/LICENSE
M node_modules/cryptiles/lib/index.js
A node_modules/cryptiles/node_modules/boom/LICENSE
A node_modules/cryptiles/node_modules/boom/lib/index.js
A node_modules/cryptiles/node_modules/boom/package.json
M node_modules/cryptiles/package.json
D node_modules/cryptiles/test/index.js
D node_modules/dashdash/node_modules/assert-plus/AUTHORS
D node_modules/dashdash/node_modules/assert-plus/assert.js
D node_modules/dashdash/node_modules/assert-plus/package.json
M node_modules/extend/package.json
A node_modules/fast-deep-equal/.eslintrc.yml
A node_modules/fast-deep-equal/.npmignore
A node_modules/fast-deep-equal/.travis.yml
A node_modules/fast-deep-equal/LICENSE
A node_modules/fast-deep-equal/benchmark/.eslintrc.yml
A node_modules/fast-deep-equal/benchmark/index.js
A node_modules/fast-deep-equal/index.js
A node_modules/fast-deep-equal/package.json
A node_modules/fast-deep-equal/spec/.eslintrc.yml
A node_modules/fast-deep-equal/spec/index.spec.js
A node_modules/fast-deep-equal/spec/tests.js
A node_modules/form-data/README.md.bak
M node_modules/form-data/lib/form_data.js
M node_modules/form-data/package.json
D node_modules/getpass/node_modules/assert-plus/AUTHORS
D node_modules/getpass/node_modules/assert-plus/assert.js
D node_modules/getpass/node_modules/assert-plus/package.json
M node_modules/har-schema/lib/afterRequest.json
M node_modules/har-schema/lib/beforeRequest.json
M node_modules/har-schema/lib/browser.json
M node_modules/har-schema/lib/cache.json
M node_modules/har-schema/lib/content.json
M node_modules/har-schema/lib/cookie.json
M node_modules/har-schema/lib/creator.json
M node_modules/har-schema/lib/entry.json
M node_modules/har-schema/lib/har.json
M node_modules/har-schema/lib/header.json
M node_modules/har-schema/lib/log.json
M node_modules/har-schema/lib/page.json
M node_modules/har-schema/lib/pageTimings.json
M node_modules/har-schema/lib/postData.json
M node_modules/har-schema/lib/query.json
M node_modules/har-schema/lib/request.json
M node_modules/har-schema/lib/response.json
M node_modules/har-schema/lib/timings.json
M node_modules/har-schema/package.json
A node_modules/har-validator/lib/async.js
D node_modules/har-validator/lib/browser/async.js
D node_modules/har-validator/lib/browser/error.js

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Config: Add the table_ng options and new storage groups

2017-09-19 Thread Mobrovac (Code Review)

Mobrovac has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/378912 )

Change subject: Config: Add the table_ng options and new storage groups
..

Config: Add the table_ng options and new storage groups

Bug: T169940
Bug: T172224
Change-Id: I9e23fba5942f6ca8b4de55c7b604e1e35f38a309
---
M scap/environments/beta/vars.yaml
M scap/templates/config.yaml.j2
M scap/vars.yaml
3 files changed, 32 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/restbase/deploy 
refs/changes/12/378912/1

diff --git a/scap/environments/beta/vars.yaml b/scap/environments/beta/vars.yaml
index 44429cd..80069e9 100644
--- a/scap/environments/beta/vars.yaml
+++ b/scap/environments/beta/vars.yaml
@@ -2,6 +2,7 @@
 page_size: 10
 user_agent: RESTBase/deployment-prep
 storage_groups: []
+storage_groups_ng: []
 cassandra_default_consistency: localOne
 domains:
   BetaCluster:
diff --git a/scap/templates/config.yaml.j2 b/scap/templates/config.yaml.j2
index a60f575..9ea6d4c 100644
--- a/scap/templates/config.yaml.j2
+++ b/scap/templates/config.yaml.j2
@@ -74,6 +74,27 @@
 # Catch-all group
 - name: default.group.local
   domains: /./
+table_ng:
+  backend: cassandra
+  hosts: ['<%= seeds_ng|join("','") if seeds_ng|length > 0 else 
seeds|join("','") %>']
+  keyspace: system
+  localDc: <%= cassandra_local_dc %>
+  datacenters: ['<%= cassandra_datacenters|join("','") %>']
+  username: <%= cassandra_user %>
+  password: <%= cassandra_password %>
+  defaultConsistency: <%= cassandra_default_consistency %>
+  <% if cassandra_tls is not none and cassandra_tls|length > 0 
%>tls:<% for key, value in cassandra_tls.iteritems() %>
+<%= key %>: <%= value -%>
+<% endfor -%>
+<% endif %>
+  storage_groups:
+  <%- for group in storage_groups_ng %>
+- name: <%= group.name %>
+  domains: <%= group.domains %>
+  <%- endfor %>
+# Catch-all group
+- name: others
+  domains: /./
 parsoid:
   host: <%= parsoid_uri %>
 action:
@@ -197,4 +218,4 @@
   user_agent: <%= user_agent %>
   ui_name: RESTBase
   ui_url: https://www.mediawiki.org/wiki/RESTBase
-  ui_title: RESTBase docs
\ No newline at end of file
+  ui_title: RESTBase docs
diff --git a/scap/vars.yaml b/scap/vars.yaml
index bf0c5d4..870caa0 100644
--- a/scap/vars.yaml
+++ b/scap/vars.yaml
@@ -57,6 +57,15 @@
 domains: /\.wikivoyage\.org$/
   - name: globaldomain.group.local
 domains: /^wikimedia\.org$/
+storage_groups_ng:
+  - name: enwiki
+domains: /^en\.wikipedia\.org$/
+  - name: commons
+domains: /^commons\.wikimedia\.org$/
+  - name: globaldomain
+domains: /^wikimedia\.org$/
+  - name: wikipedia
+domains: /\.wikipedia\.org$/
 domains:
   Wikipedia:
 ab.wikipedia.org: default_project

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9e23fba5942f6ca8b4de55c7b604e1e35f38a309
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/restbase/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 

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

[MediaWiki-commits] [Gerrit] mediawiki...BetaFeatures[wmf/1.30.0-wmf.18]: Temporary log all the executions of the update job.

2017-09-15 Thread Mobrovac (Code Review)

Mobrovac has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/378222 )

Change subject: Temporary log all the executions of the update job.
..

Temporary log all the executions of the update job.

As a part of migration to the EventBus based JobQueue,
we've started to double-process the UpdateBetaFeatureUserCountsJob.
In order to verify correctness and compare 2 queue implementations,
we will temporary log all the executions of the job and then match
the logs between old and new pipelines. The job is extremelly low
volume, ~0.1/s, so we would not flood the logs.

See also: https://gerrit.wikimedia.org/r/#/c/378078
Bug: T175637

Change-Id: I9d0345292a63e5516aae727de7c047117faa5ae0
---
M includes/UpdateBetaFeatureUserCountsJob.php
1 file changed, 14 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BetaFeatures 
refs/changes/22/378222/1

diff --git a/includes/UpdateBetaFeatureUserCountsJob.php 
b/includes/UpdateBetaFeatureUserCountsJob.php
index f354e08..916d1ca 100644
--- a/includes/UpdateBetaFeatureUserCountsJob.php
+++ b/includes/UpdateBetaFeatureUserCountsJob.php
@@ -23,11 +23,18 @@
  * @license GNU General Public License version 2 or later
  */
 
+use MediaWiki\Logger\LoggerFactory;
+
 class UpdateBetaFeatureUserCountsJob extends Job {
+
+   /** @var \Psr\Log\LoggerInterface */
+   private $logger;
+
public function __construct( $title, $params ) {
parent::__construct( 'updateBetaFeaturesUserCounts', $title, 
$params );
 
$this->removeDuplicates = true;
+   $this->logger = LoggerFactory::getInstance( 
'updateBetaFeaturesUserCounts' );
}
 
/**
@@ -36,6 +43,13 @@
 * @return bool
 */
public function run() {
+   // Temporarily log all the jobs in order to compare old redis 
JobQueue with EventBus
+   // JobQueue pipeline. This event is very low-volume (~0.1 
events per second), so we
+   // will not overload the logs.
+   // Jobs delivered by EventBus will have the 'pipeline' property 
set to EventBus
+   // so that the corresponding jobs can be matched together using 
the requestId.
+   $this->logger->info( 'Executing', $this->params );
+
$dbw = wfGetDB( DB_MASTER );
 
$res = $dbw->select(

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9d0345292a63e5516aae727de7c047117faa5ae0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BetaFeatures
Gerrit-Branch: wmf/1.30.0-wmf.18
Gerrit-Owner: Mobrovac 
Gerrit-Reviewer: Ppchelko 

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

[MediaWiki-commits] [Gerrit] mediawiki...jobqueue-deploy[master]: [Config] Annotate the job event with pipeline property.

2017-09-15 Thread Mobrovac (Code Review)

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

Change subject: [Config] Annotate the job event with pipeline property.
..


[Config] Annotate the job event with pipeline property.

To be able to log and debug the old vs new JobQueue jobs
we can add a 'pipeline' property to the event and set it
to EventBus in the new pipeline. That way we can log all
the event executions and compare the correctness side-by-side.

Change-Id: Iff96056f592eb41542512f7b02a0b83f81b78120
---
M scap/templates/config.yaml.j2
1 file changed, 9 insertions(+), 1 deletion(-)

Approvals:
  Mobrovac: Verified; Looks good to me, approved



diff --git a/scap/templates/config.yaml.j2 b/scap/templates/config.yaml.j2
index 057746e..94004ac 100644
--- a/scap/templates/config.yaml.j2
+++ b/scap/templates/config.yaml.j2
@@ -40,7 +40,15 @@
   uri: '<%= jobrunner_uri %>'
   headers:
 content-type: 'application/json'
-  body: '{{globals.message}}'
+  # Temporary so that we could add a 'pipeline' property to 
the params.
+  body:
+database: '{{message.database}}'
+meta: '{{message.meta}}'
+page_namespace: '{{message.page_namespace}}'
+page_title: '{{message.page_title}}'
+params: '{{merge(message.params, {"pipeline": 
"EventBus"})}}'
+sha1: '{{message.sha1}}'
+type: '{{message.type}}'
 
 
 # Number of worker processes to spawn.

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iff96056f592eb41542512f7b02a0b83f81b78120
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/services/change-propagation/jobqueue-deploy
Gerrit-Branch: master
Gerrit-Owner: Ppchelko 
Gerrit-Reviewer: GWicke 
Gerrit-Reviewer: Mobrovac 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: WIP: Cassandra: Include only instance DNS' in the list of seeds

2017-09-14 Thread Mobrovac (Code Review)

Mobrovac has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/377997 )

Change subject: WIP: Cassandra: Include only instance DNS' in the list of seeds
..

WIP: Cassandra: Include only instance DNS' in the list of seeds

Change-Id: I0a00f1d8efb143edfe18a8749dfbda3ba32753e3
---
M modules/cassandra/templates/cassandra.yaml-2.1.erb
M modules/cassandra/templates/cassandra.yaml-2.2.erb
M modules/cassandra/templates/cassandra.yaml-3.x.erb
M modules/profile/manifests/cassandra.pp
M modules/profile/templates/cassandra/seeds.erb
5 files changed, 14 insertions(+), 17 deletions(-)


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

diff --git a/modules/cassandra/templates/cassandra.yaml-2.1.erb 
b/modules/cassandra/templates/cassandra.yaml-2.1.erb
index 63775da..12f9d80 100644
--- a/modules/cassandra/templates/cassandra.yaml-2.1.erb
+++ b/modules/cassandra/templates/cassandra.yaml-2.1.erb
@@ -273,10 +273,7 @@
   x != @hostname \
   && ! (x.start_with? 
"#{@hostname}-") \
   && x != @ipaddress \
-  && x != @fqdn \
-  && 
(/^.+-[a-z]\.(?:eqiad|codfw)\.wmnet$/ =~ x \
-|| @instance_count == 
1 \
-|| 
/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/ =~ x)
+  && x != @fqdn)
   }.join(',') : 
@seeds.join(',') %>
  - seeds: <%= clean_seeds %>
 # For workloads with more data than can fit in memory, Cassandra's
diff --git a/modules/cassandra/templates/cassandra.yaml-2.2.erb 
b/modules/cassandra/templates/cassandra.yaml-2.2.erb
index cdf6404..c0ff8d3 100644
--- a/modules/cassandra/templates/cassandra.yaml-2.2.erb
+++ b/modules/cassandra/templates/cassandra.yaml-2.2.erb
@@ -318,10 +318,7 @@
   x != @hostname \
   && ! (x.start_with? 
"#{@hostname}-") \
   && x != @ipaddress \
-  && x != @fqdn \
-  && 
(/^.+-[a-z]\.(?:eqiad|codfw)\.wmnet$/ =~ x \
-|| @instance_count == 
1 \
-|| 
/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/ =~ x)
+  && x != @fqdn)
   }.join(',') : 
@seeds.join(',') %>
  - seeds: <%= clean_seeds %>
 # For workloads with more data than can fit in memory, Cassandra's
diff --git a/modules/cassandra/templates/cassandra.yaml-3.x.erb 
b/modules/cassandra/templates/cassandra.yaml-3.x.erb
index 46edbb3..95281db 100644
--- a/modules/cassandra/templates/cassandra.yaml-3.x.erb
+++ b/modules/cassandra/templates/cassandra.yaml-3.x.erb
@@ -404,10 +404,7 @@
   x != @hostname \
   && ! (x.start_with? 
"#{@hostname}-") \
   && x != @ipaddress \
-  && x != @fqdn \
-  && 
(/^.+-[a-z]\.(?:eqiad|codfw)\.wmnet$/ =~ x \
-|| @instance_count == 
1 \
-|| 
/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/ =~ x)
+  && x != @fqdn)
   }.join(',') : 
@seeds.join(',') %>
  - seeds: <%= clean_seeds %>
 # For workloads with more data than can fit in memory, Cassandra's
diff --git a/modules/profile/manifests/cassandra.pp 
b/modules/profile/manifests/cassandra.pp
index 629b0f4..217724d 100644
--- a/modules/profile/manifests/cassandra.pp
+++ b/modules/profile/manifests/cassandra.pp
@@ -14,7 +14,9 @@
 $instances = $all_instances[$::fqdn]
 # We get the cassandra seeds from $all_instances, with a template hack
 # This is preferred over a very specialized parser function.
-$seeds = split(template('profile/cassandra/seeds.erb'), '\|')
+$all_seeds = split(template('profile/cassandra/seeds.erb'), '\|')
+$seeds = split($all_seeds[0], ',')
+$ferm_seeds = split($all_seeds[1], ',')
 
 $base_settings = {
 'instances' => $instances,
@@ -70,7 +72,7 @@
 description => 'Cassandra server',
 }
 
-

[MediaWiki-commits] [Gerrit] mediawiki...jobqueue-deploy[master]: Add the src submodule

2017-09-13 Thread Mobrovac (Code Review)

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

Change subject: Add the src submodule
..


Add the src submodule

Change-Id: Ib569a4cab1a0a5297471315064f588cc0591b68a
---
A .gitmodules
A src
2 files changed, 4 insertions(+), 0 deletions(-)

Approvals:
  Mobrovac: Verified; Looks good to me, approved



diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 000..bee562e
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "src"]
+   path = src
+   url = 
https://gerrit.wikimedia.org/r/mediawiki/services/change-propagation
diff --git a/src b/src
new file mode 16
index 000..6a6740f
--- /dev/null
+++ b/src
@@ -0,0 +1 @@
+Subproject commit 6a6740f6e7c7b5beabfb8226eb89aa7ef629cf51

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib569a4cab1a0a5297471315064f588cc0591b68a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/change-propagation/jobqueue-deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 
Gerrit-Reviewer: Mobrovac 

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

[MediaWiki-commits] [Gerrit] mediawiki...jobqueue-deploy[master]: Add the src submodule

2017-09-13 Thread Mobrovac (Code Review)

Mobrovac has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/30 )

Change subject: Add the src submodule
..

Add the src submodule

Change-Id: Ib569a4cab1a0a5297471315064f588cc0591b68a
---
A .gitmodules
A src
2 files changed, 4 insertions(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/services/change-propagation/jobqueue-deploy
 refs/changes/70/30/1

diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 000..bee562e
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "src"]
+   path = src
+   url = 
https://gerrit.wikimedia.org/r/mediawiki/services/change-propagation
diff --git a/src b/src
new file mode 16
index 000..6a6740f
--- /dev/null
+++ b/src
@@ -0,0 +1 @@
+Subproject commit 6a6740f6e7c7b5beabfb8226eb89aa7ef629cf51

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib569a4cab1a0a5297471315064f588cc0591b68a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/change-propagation/jobqueue-deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 

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

[MediaWiki-commits] [Gerrit] mediawiki...jobqueue-deploy[master]: [Config] Enable processing of the updateBetaFeaturesUserCoun...

2017-09-13 Thread Mobrovac (Code Review)

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

Change subject: [Config] Enable processing of the updateBetaFeaturesUserCounts 
job.
..


[Config] Enable processing of the updateBetaFeaturesUserCounts job.

The updateBetaFeaturesUserCounts job is perfect for the first test of
the new pipeline, so creacte a rule that will execute this job.

Bug: T175210
Change-Id: I67fff9685d2c3e742806ee28e7733c50c755343f
---
M scap/templates/config.yaml.j2
1 file changed, 9 insertions(+), 2 deletions(-)

Approvals:
  Mobrovac: Verified; Looks good to me, approved



diff --git a/scap/templates/config.yaml.j2 b/scap/templates/config.yaml.j2
index 886edf7..057746e 100644
--- a/scap/templates/config.yaml.j2
+++ b/scap/templates/config.yaml.j2
@@ -32,8 +32,15 @@
   fetch.message.max.bytes: <%= kafka_max_bytes %>
 concurrency: <%= concurrency %>
 startup_delay: 6
-# no rules for first deployment
-templates: {}
+templates:
+  updateBetaFeaturesUserCounts:
+topic: 'mediawiki.job.updateBetaFeaturesUserCounts'
+exec:
+  method: post
+  uri: '<%= jobrunner_uri %>'
+  headers:
+content-type: 'application/json'
+  body: '{{globals.message}}'
 
 
 # Number of worker processes to spawn.

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I67fff9685d2c3e742806ee28e7733c50c755343f
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/services/change-propagation/jobqueue-deploy
Gerrit-Branch: master
Gerrit-Owner: Ppchelko 
Gerrit-Reviewer: GWicke 
Gerrit-Reviewer: Mobrovac 

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

[MediaWiki-commits] [Gerrit] mediawiki...jobqueue-deploy[master]: [Config] Set a specific prefix for redis keys.

2017-09-13 Thread Mobrovac (Code Review)

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

Change subject: [Config] Set a specific prefix for redis keys.
..


[Config] Set a specific prefix for redis keys.

See https://github.com/wikimedia/change-propagation/pull/204

Change-Id: Id6ee8e5c936bbb945223b8d9cce552735fc38336
---
M scap/templates/config.yaml.j2
1 file changed, 1 insertion(+), 0 deletions(-)

Approvals:
  Mobrovac: Verified; Looks good to me, approved



diff --git a/scap/templates/config.yaml.j2 b/scap/templates/config.yaml.j2
index 8031b95..886edf7 100644
--- a/scap/templates/config.yaml.j2
+++ b/scap/templates/config.yaml.j2
@@ -14,6 +14,7 @@
   x-modules:
 - path: src/sys/deduplicator.js
   options:
+redis_prefix: 'CPJQ'
 redis:
   path: <%= redis_path %>
   password: <%= redis_pass if redis_pass else '' %>

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id6ee8e5c936bbb945223b8d9cce552735fc38336
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/change-propagation/jobqueue-deploy
Gerrit-Branch: master
Gerrit-Owner: Ppchelko 
Gerrit-Reviewer: GWicke 
Gerrit-Reviewer: Mobrovac 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Kafka: Make all Kafka clients require the same set of packages

2017-09-11 Thread Mobrovac (Code Review)

Mobrovac has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/377238 )

Change subject: Kafka: Make all Kafka clients require the same set of packages
..

Kafka: Make all Kafka clients require the same set of packages

Change-Id: I805386bab2a2ff2a7f297d5308d570f1b6a7d1d1
---
M modules/profile/manifests/changeprop.pp
D modules/profile/manifests/changeprop/packages.pp
M modules/profile/manifests/cpjobqueue.pp
M modules/profile/manifests/eventstreams.pp
A modules/profile/manifests/kafka/librdkafka.pp
M modules/profile/manifests/trendingedits.pp
6 files changed, 16 insertions(+), 19 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/38/377238/1

diff --git a/modules/profile/manifests/changeprop.pp 
b/modules/profile/manifests/changeprop.pp
index d825459..640f263 100644
--- a/modules/profile/manifests/changeprop.pp
+++ b/modules/profile/manifests/changeprop.pp
@@ -11,7 +11,7 @@
 
 include ::passwords::redis
 include ::service::configuration
-require ::profile::changeprop::packages
+require ::profile::kafka::librdkafka
 
 $kafka_config = kafka_config('main')
 $broker_list = $kafka_config['brokers']['string']
diff --git a/modules/profile/manifests/changeprop/packages.pp 
b/modules/profile/manifests/changeprop/packages.pp
deleted file mode 100644
index 1df50de..000
--- a/modules/profile/manifests/changeprop/packages.pp
+++ /dev/null
@@ -1,9 +0,0 @@
-# Packages required by changeprop and cpjobqueue
-class profile::changeprop::packages() {
-
-service::packages { 'changeprop':
-pkgs => ['librdkafka++1', 'librdkafka1'],
-dev_pkgs => ['librdkafka-dev'],
-}
-
-}
diff --git a/modules/profile/manifests/cpjobqueue.pp 
b/modules/profile/manifests/cpjobqueue.pp
index 2fa2463..7d98e2f 100644
--- a/modules/profile/manifests/cpjobqueue.pp
+++ b/modules/profile/manifests/cpjobqueue.pp
@@ -25,7 +25,7 @@
 ) {
 
 include ::passwords::redis
-require ::profile::changeprop::packages
+require ::profile::kafka::librdkafka
 
 $kafka_config = kafka_config('main')
 
diff --git a/modules/profile/manifests/eventstreams.pp 
b/modules/profile/manifests/eventstreams.pp
index d340984..0917a68 100644
--- a/modules/profile/manifests/eventstreams.pp
+++ b/modules/profile/manifests/eventstreams.pp
@@ -37,11 +37,11 @@
 $streams = hiera('profile::eventstreams::streams'),
 $rdkafka_config = hiera('profile::eventstreams::rdkafka_config')
 ) {
+
+require ::profile::kafka::librdkafka
+
 $kafka_config = kafka_config($kafka_cluster_name)
 $broker_list = $kafka_config['brokers']['string']
-service::packages { 'eventstreams':
-pkgs => ['librdkafka++1', 'librdkafka1'],
-}
 
 service::node { 'eventstreams':
 enable=> true,
diff --git a/modules/profile/manifests/kafka/librdkafka.pp 
b/modules/profile/manifests/kafka/librdkafka.pp
new file mode 100644
index 000..b0fabab
--- /dev/null
+++ b/modules/profile/manifests/kafka/librdkafka.pp
@@ -0,0 +1,9 @@
+# Packages required by Kafka clients
+class profile::kafka::librdkafka() {
+
+service::packages { 'librdkafka':
+pkgs => ['librdkafka++1', 'librdkafka1'],
+dev_pkgs => ['librdkafka-dev'],
+}
+
+}
diff --git a/modules/profile/manifests/trendingedits.pp 
b/modules/profile/manifests/trendingedits.pp
index ca57360..6e67cc0 100644
--- a/modules/profile/manifests/trendingedits.pp
+++ b/modules/profile/manifests/trendingedits.pp
@@ -1,13 +1,10 @@
 # Profile class for trendingedits
 class profile::trendingedits {
 
+require ::profile::kafka::librdkafka
+
 $kafka_config = kafka_config('main')
 $port = 6699
-
-service::packages { 'trendingedits':
-pkgs => ['librdkafka++1', 'librdkafka1'],
-dev_pkgs => ['librdkafka-dev'],
-}
 
 service::node { 'trendingedits':
 port  => $port,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I805386bab2a2ff2a7f297d5308d570f1b6a7d1d1
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mobrovac 

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

[MediaWiki-commits] [Gerrit] mediawiki...jobqueue-deploy[master]: Bug fix: The service's name is cpjobqueue, not cp-jobqueue

2017-09-11 Thread Mobrovac (Code Review)

Mobrovac has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/377221 )

Change subject: Bug fix: The service's name is cpjobqueue, not cp-jobqueue
..

Bug fix: The service's name is cpjobqueue, not cp-jobqueue

Bug: T175281
Change-Id: I99d2e7a39f181e301c6c4f377f9788d89ca061e9
---
M scap/config-files.yaml
M scap/scap.cfg
M scap/vars.yaml
3 files changed, 6 insertions(+), 6 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/services/change-propagation/jobqueue-deploy
 refs/changes/21/377221/1

diff --git a/scap/config-files.yaml b/scap/config-files.yaml
index 0b0ded0..20bf12f 100644
--- a/scap/config-files.yaml
+++ b/scap/config-files.yaml
@@ -1,5 +1,5 @@
 ---
-/etc/cp-jobqueue/config.yaml:
+/etc/cpjobqueue/config.yaml:
   template: config.yaml.j2
   erb_syntax: True
-  remote_vars: /etc/cp-jobqueue/config-vars.yaml
+  remote_vars: /etc/cpjobqueue/config-vars.yaml
diff --git a/scap/scap.cfg b/scap/scap.cfg
index 92d7af8..d6bc8e6 100644
--- a/scap/scap.cfg
+++ b/scap/scap.cfg
@@ -7,7 +7,7 @@
 canary_dsh_targets: cpjq-canary
 dsh_targets: cpjq
 git_submodules: True
-service_name: cp-jobqueue
+service_name: cpjobqueue
 service_port: 7200
 lock_file: /tmp/scap.cpjq.lock
 config_deploy: True
diff --git a/scap/vars.yaml b/scap/vars.yaml
index 02c639a..ea9031f 100644
--- a/scap/vars.yaml
+++ b/scap/vars.yaml
@@ -1,14 +1,14 @@
 # log-related variables
-log_name: cp-jobqueue
+log_name: cpjobqueue
 logstash_host: localhost
 logstash_port: 12201
 log_file: /tmp/cpjq.log
 # metrics
-metrics_name: cp-jobqueue
+metrics_name: cpjobqueue
 metrics_host: localhost
 metrics_port: 8252
 # service
-name: cp-jobqueue
+name: cpjobqueue
 port: 7200
 proxy:
 site: datacenter1

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I99d2e7a39f181e301c6c4f377f9788d89ca061e9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/change-propagation/jobqueue-deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 

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

[MediaWiki-commits] [Gerrit] mediawiki...jobqueue-deploy[master]: Bug fix: The service's name is cpjobqueue, not cp-jobqueue

2017-09-11 Thread Mobrovac (Code Review)

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

Change subject: Bug fix: The service's name is cpjobqueue, not cp-jobqueue
..


Bug fix: The service's name is cpjobqueue, not cp-jobqueue

Bug: T175281
Change-Id: I99d2e7a39f181e301c6c4f377f9788d89ca061e9
---
M scap/config-files.yaml
M scap/scap.cfg
M scap/vars.yaml
3 files changed, 6 insertions(+), 6 deletions(-)

Approvals:
  Mobrovac: Verified; Looks good to me, approved



diff --git a/scap/config-files.yaml b/scap/config-files.yaml
index 0b0ded0..20bf12f 100644
--- a/scap/config-files.yaml
+++ b/scap/config-files.yaml
@@ -1,5 +1,5 @@
 ---
-/etc/cp-jobqueue/config.yaml:
+/etc/cpjobqueue/config.yaml:
   template: config.yaml.j2
   erb_syntax: True
-  remote_vars: /etc/cp-jobqueue/config-vars.yaml
+  remote_vars: /etc/cpjobqueue/config-vars.yaml
diff --git a/scap/scap.cfg b/scap/scap.cfg
index 92d7af8..d6bc8e6 100644
--- a/scap/scap.cfg
+++ b/scap/scap.cfg
@@ -7,7 +7,7 @@
 canary_dsh_targets: cpjq-canary
 dsh_targets: cpjq
 git_submodules: True
-service_name: cp-jobqueue
+service_name: cpjobqueue
 service_port: 7200
 lock_file: /tmp/scap.cpjq.lock
 config_deploy: True
diff --git a/scap/vars.yaml b/scap/vars.yaml
index 02c639a..ea9031f 100644
--- a/scap/vars.yaml
+++ b/scap/vars.yaml
@@ -1,14 +1,14 @@
 # log-related variables
-log_name: cp-jobqueue
+log_name: cpjobqueue
 logstash_host: localhost
 logstash_port: 12201
 log_file: /tmp/cpjq.log
 # metrics
-metrics_name: cp-jobqueue
+metrics_name: cpjobqueue
 metrics_host: localhost
 metrics_port: 8252
 # service
-name: cp-jobqueue
+name: cpjobqueue
 port: 7200
 proxy:
 site: datacenter1

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I99d2e7a39f181e301c6c4f377f9788d89ca061e9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/change-propagation/jobqueue-deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 
Gerrit-Reviewer: Mobrovac 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: ChangeProp: Separate packages into profile::changeprop::pack...

2017-09-11 Thread Mobrovac (Code Review)

Mobrovac has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/377218 )

Change subject: ChangeProp: Separate packages into profile::changeprop::packages
..

ChangeProp: Separate packages into profile::changeprop::packages

Change-Id: I768a6000c7ae44017a71f2790b8c5894b88e4f33
---
M modules/profile/manifests/changeprop.pp
A modules/profile/manifests/changeprop/packages.pp
M modules/profile/manifests/cpjobqueue.pp
3 files changed, 12 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/18/377218/1

diff --git a/modules/profile/manifests/changeprop.pp 
b/modules/profile/manifests/changeprop.pp
index a9aed56..d825459 100644
--- a/modules/profile/manifests/changeprop.pp
+++ b/modules/profile/manifests/changeprop.pp
@@ -11,15 +11,12 @@
 
 include ::passwords::redis
 include ::service::configuration
+require ::profile::changeprop::packages
+
 $kafka_config = kafka_config('main')
 $broker_list = $kafka_config['brokers']['string']
 $redis_path = "/var/run/nutcracker/redis_${::site}.sock"
 $redis_pass = $::passwords::redis::main_password
-
-service::packages { 'changeprop':
-pkgs => ['librdkafka++1', 'librdkafka1'],
-dev_pkgs => ['librdkafka-dev'],
-}
 
 service::node { 'changeprop':
 enable=> true,
diff --git a/modules/profile/manifests/changeprop/packages.pp 
b/modules/profile/manifests/changeprop/packages.pp
new file mode 100644
index 000..1df50de
--- /dev/null
+++ b/modules/profile/manifests/changeprop/packages.pp
@@ -0,0 +1,9 @@
+# Packages required by changeprop and cpjobqueue
+class profile::changeprop::packages() {
+
+service::packages { 'changeprop':
+pkgs => ['librdkafka++1', 'librdkafka1'],
+dev_pkgs => ['librdkafka-dev'],
+}
+
+}
diff --git a/modules/profile/manifests/cpjobqueue.pp 
b/modules/profile/manifests/cpjobqueue.pp
index afc91a0..2fa2463 100644
--- a/modules/profile/manifests/cpjobqueue.pp
+++ b/modules/profile/manifests/cpjobqueue.pp
@@ -25,7 +25,7 @@
 ) {
 
 include ::passwords::redis
-require ::changeprop::packages
+require ::profile::changeprop::packages
 
 $kafka_config = kafka_config('main')
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I768a6000c7ae44017a71f2790b8c5894b88e4f33
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mobrovac 

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

[MediaWiki-commits] [Gerrit] mediawiki...mathoid[master]: Commit to test CI

2017-09-11 Thread Mobrovac (Code Review)

Mobrovac has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/377217 )

Change subject: Commit to test CI
..

Commit to test CI

Change-Id: Ic6002186d8082354d2cc011a88d678aa10ef4df4
---
M README.md
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/mathoid 
refs/changes/17/377217/1

diff --git a/README.md b/README.md
index 1fbc5cf..8fa7f8e 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@
 ```bash
 sudo apt-get install librsvg2-dev
 ```
-Thereafter, install mathoid by running
+Thereafter, install Mathoid by running
 ```bash
 npm install mathoid
 node /node_modules/mathoid/server.js

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic6002186d8082354d2cc011a88d678aa10ef4df4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/mathoid
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 

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

[MediaWiki-commits] [Gerrit] mediawiki...translators[master]: Update translators to upstream HEAD e03695273

2017-09-11 Thread Mobrovac (Code Review)

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

Change subject: Update translators to upstream HEAD e03695273
..


Update translators to upstream HEAD e03695273

https://github.com/zotero/translators/commit/e036952738c2860d3204097cc256e953e84851ab

Conflicts:
.ci/checkDeletedTxt.sh
AEA Web.js
APA PsycNET.js
APS.js
Access Medicine.js
AllAfrica.js
AlterNet.js
Amazon.js
American Institute of Aeronautics and Astronautics.js
BBC.js
BibLaTeX.js
BibTeX.js
Bibliontology RDF.js
Bibliotheque nationale de France.js
BioMed Central.js
Bloomberg.js
CNKI.js
CSL JSON.js
Cairn.info.js
Cell Press.js
Chronicling America.js
Columbia University Press.js
Common-Place.js
CrossRef.js
Cyberpresse.js
DAI-Zenon.js
Dagstuhl Research Online Publication Server.js
DeGruyter.js
Dialnet.js
DrugBank.ca.js
Edinburgh University Press Journals.js
Elsevier Health Journals.js
Embedded Metadata.js
Endnote XML.js
Fairfax Australia.js
Figshare.js
Foreign Affairs.js
Frontiers.js
GameSpot.js
Google Play.js
Harpers.js
Hindawi Publishers.js
IEEE Computer Society.js
IEEE Xplore.js
IMDb.js
Internet Archive.js
Isidore.js
Journal of Electronic Publishing.js
Library Catalog (InnoPAC).js
Lulu.js
NYTimes.com.js
OSTI Energy Citations.js
Open Journal Systems.js
Paris Review.js
Pastebin.js
Project MUSE.js
Publications du Quebec.js
RDF.js
RIS.js
RSC Publishing.js
RePEc - Econpapers.js
RePEc - IDEAS.js
Rock, Paper, Shotgun.js
Roll Call.js
SAGE Journals.js
SSOAR.js
ScienceDirect.js
SlideShare.js
Springer Link.js
Tatar zamani.js
Taylor and Francis+NEJM.js
The Atlantic.js
The Chronicle of Higher Education.js
The Daily Beast.js
The Free Dictionary.js
The Globe and Mail.js
The Guardian.js
The Hindu.js
The Microfinance Gateway.js
The New Yorker.js
The Open Library.js
Theory of Computing.js
Toronto Star.js
Treesearch.js
Twitter.js
USgamer.js
Vanderbilt eJournals.js
Vimeo.js
VoxEU.js
Washington Monthly.js
ZIPonline.js
Zenodo.js
deleted.txt
digibib.net.js
eLibrary.ru.js
eMedicine.js
fishpond.co.nz.js
mEDRA.js
taz.de.js
washingtonpost.com.js

Bug: T174992
Change-Id: I3fa301822f1d2e8044bc96eba2ecbd0a6a73
---
M .ci/checkDeletedTxt.sh
M AEA Web.js
M APA PsycNET.js
M APS.js
M Access Medicine.js
M Airiti.js
M AllAfrica.js
M AlterNet.js
M Amazon.js
M American Institute of Aeronautics and Astronautics.js
A BBC Genome.js
M BBC.js
A Baidu Scholar.js
M BibLaTeX.js
M BibTeX.js
M Bibliontology RDF.js
R Bibliotheque et Archives Nationales du Quebec.js
M Bibliotheque nationale de France.js
M BioMed Central.js
M Bloomberg.js
M Bookmarks.js
M Brill Journals.js
M Bundesgesetzblatt.js
M CABI - CAB Abstracts.js
M CNKI.js
M CSL JSON.js
M Cairn.info.js
M Canadiana.ca.js
M Cell Press.js
M Champlain Society - Collection.js
M Chronicling America.js
M Columbia University Press.js
M Common-Place.js
M CrossRef.js
M Cyberpresse.js
M DAI-Zenon.js
M Dagstuhl Research Online Publication Server.js
M DataCite.js
M DeGruyter.js
M Dialnet.js
M DrugBank.ca.js
M EIDR.js
M Edinburgh University Press Journals.js
M Elsevier Health Journals.js
M Embedded Metadata.js
M Endnote XML.js
M Euclid.js
M Fairfax Australia.js
M Figshare.js
M Foreign Affairs.js
M Frontiers.js
A GMS German Medical Science.js
M GPO Access e-CFR.js
M GameSpot.js
M Gasyrlar Awazy.js
M Gemeinsamer Bibliotheksverbund ISBN.js
M Google Patents.js
M Google Play.js
A Google Presentation.js
M HAL Archives Ouvertes.js
M Harpers.js
M Hindawi Publishers.js
M IEEE Computer Society.js
M IEEE Xplore.js
M IMDb.js
M Internet Archive.js
M Isidore.js
M Journal of Electronic Publishing.js
M Library Catalog (InnoPAC).js
M Library of Congress ISBN.js
A Lippincott Williams and Wilkins.js
M Lulu.js
M NYTimes.com.js
M New Zealand Herald.js
M OSTI Energy Citations.js
M OVID Tagged.js
A Open Conf.js
M Open Journal Systems.js
M Open WorldCat.js
M PEI Archival Information Network.js
M PLoS Journals.js
M Papers Past.js
M Paris Review.js
M Pastebin.js
M Philosopher's Imprint.js
D Pion Journals.js
M ProQuest.js
M Project MUSE.js
M Protein Data Bank.js
M PubMed.js
M Pubget.js
M Publications du Quebec.js
M RDF.js
M REDALYC.js
M RIS.js
M RSC Publishing.js
R Radio Free

[MediaWiki-commits] [Gerrit] operations/puppet[production]: CP-JobQueue: Add the service to SCB

2017-09-11 Thread Mobrovac (Code Review)

Mobrovac has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/377213 )

Change subject: CP-JobQueue: Add the service to SCB
..

CP-JobQueue: Add the service to SCB

Bug: T175281
Change-Id: I1ebdb7eb4964e0ecb57c050ce46876bb8e72a1c7
---
M hieradata/role/common/scb.yaml
M modules/admin/data/data.yaml
M modules/role/manifests/scb.pp
3 files changed, 14 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/13/377213/1

diff --git a/hieradata/role/common/scb.yaml b/hieradata/role/common/scb.yaml
index f2e4eec..aa8f069 100644
--- a/hieradata/role/common/scb.yaml
+++ b/hieradata/role/common/scb.yaml
@@ -3,6 +3,7 @@
   - sc-admins
   - citoid-admin
   - citoid-users
+  - cpjobqueue-admin
   - cxserver-admin
   - apertium-admins
   - graphoid-admin
diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index c368c39..86fe9b8 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -526,6 +526,7 @@
 privileges: ['ALL = NOPASSWD: /usr/bin/puppet agent *',
'ALL = NOPASSWD: /usr/sbin/service changeprop *',
'ALL = NOPASSWD: /usr/sbin/service citoid *',
+   'ALL = NOPASSWD: /usr/sbin/service cpjobqueue *',
'ALL = NOPASSWD: /usr/sbin/service cxserver *',
'ALL = NOPASSWD: /usr/sbin/service graphoid *',
'ALL = NOPASSWD: /usr/sbin/service mathoid *',
@@ -617,6 +618,12 @@
 members: [gwicke, ppchelko, eevans, mobrovac, nschaaf]
 privileges: ['ALL = NOPASSWD: /usr/sbin/service recommendation_api *',
  'ALL = (recommendation_api) NOPASSWD: ALL']
+  cpjobqueue-admin:
+description: Group of cpjobqueue admins
+gid: 795
+members: [mobrovac, gwicke, ppchelko, eevans]
+privileges: ['ALL = NOPASSWD: /usr/sbin/service cpjobqueue *',
+ 'ALL = (cpjobqueue) NOPASSWD: ALL']
 
 users:
   rush:
diff --git a/modules/role/manifests/scb.pp b/modules/role/manifests/scb.pp
index 1ae90c0..39c44af 100644
--- a/modules/role/manifests/scb.pp
+++ b/modules/role/manifests/scb.pp
@@ -5,6 +5,11 @@
 include ::profile::ores::web
 include ::profile::nutcracker
 
+include ::profile::cpjobqueue
+system::role { 'cpjobqueue':
+description => 'ChangeProp instance for the JobQueue',
+}
+
 include ::profile::recommendation_api
 
 include role::mobileapps
@@ -24,4 +29,5 @@
 if hiera('has_lvs', true) {
 include role::lvs::realserver
 }
+
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1ebdb7eb4964e0ecb57c050ce46876bb8e72a1c7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mobrovac 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: ChangeProp-JobQueue: Fix the repo location and name

2017-09-08 Thread Mobrovac (Code Review)

Mobrovac has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/376724 )

Change subject: ChangeProp-JobQueue: Fix the repo location and name
..

ChangeProp-JobQueue: Fix the repo location and name

Bug: T175281
Change-Id: I029f8b52e51277dcbde341f1ea1289465f1a9a55
---
M hieradata/role/common/deployment_server.yaml
M modules/profile/manifests/cpjobqueue.pp
2 files changed, 4 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/24/376724/1

diff --git a/hieradata/role/common/deployment_server.yaml 
b/hieradata/role/common/deployment_server.yaml
index f82f4d5..90380c6 100644
--- a/hieradata/role/common/deployment_server.yaml
+++ b/hieradata/role/common/deployment_server.yaml
@@ -91,7 +91,9 @@
 #lvs_service: changeprop
   citoid/deploy: {}
 #lvs_service: citoid
-  cp-jobqueue: {}
+  cpjobqueue/deploy: {
+repository: mediawiki/services/change-propagation/jobqueue-deploy
+  }
   cxserver/deploy: {}
 #lvs_service: cxserver
   dumps/dumps:
diff --git a/modules/profile/manifests/cpjobqueue.pp 
b/modules/profile/manifests/cpjobqueue.pp
index 8ca37b9..afc91a0 100644
--- a/modules/profile/manifests/cpjobqueue.pp
+++ b/modules/profile/manifests/cpjobqueue.pp
@@ -29,8 +29,7 @@
 
 $kafka_config = kafka_config('main')
 
-service::node { 'cp-jobqueue':
-repo  => 'cp-jobqueue',
+service::node { 'cpjobqueue':
 port  => 7200,
 healthcheck_url   => '',
 has_spec  => true,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I029f8b52e51277dcbde341f1ea1289465f1a9a55
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mobrovac 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Add the cp-jobqueue profile

2017-09-08 Thread Mobrovac (Code Review)

Mobrovac has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/376707 )

Change subject: Add the cp-jobqueue profile
..

Add the cp-jobqueue profile

Bug: T175281
Change-Id: I78a09d0d99ae20a38d397da8f8a1faf9dd015fe3
---
M hieradata/role/common/deployment_server.yaml
M hieradata/role/common/scb.yaml
A modules/profile/manifests/cpjobqueue.pp
3 files changed, 62 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/07/376707/1

diff --git a/hieradata/role/common/deployment_server.yaml 
b/hieradata/role/common/deployment_server.yaml
index ba38195..f82f4d5 100644
--- a/hieradata/role/common/deployment_server.yaml
+++ b/hieradata/role/common/deployment_server.yaml
@@ -91,6 +91,7 @@
 #lvs_service: changeprop
   citoid/deploy: {}
 #lvs_service: citoid
+  cp-jobqueue: {}
   cxserver/deploy: {}
 #lvs_service: cxserver
   dumps/dumps:
diff --git a/hieradata/role/common/scb.yaml b/hieradata/role/common/scb.yaml
index 6f12fb2..f2e4eec 100644
--- a/hieradata/role/common/scb.yaml
+++ b/hieradata/role/common/scb.yaml
@@ -91,3 +91,7 @@
 
 # Recommendation API
 profile::recommendation_api::wdqs_uri: "http://wdqs.discovery.wmnet;
+
+# ChangePropagation for JobQueue
+profile::cpjobqueue::redis_path: "/var/run/nutcracker/redis_%{::site}.sock"
+profile::cpjobqueue::jobrunner_host: https://jobrunner.discovery.wmnet
diff --git a/modules/profile/manifests/cpjobqueue.pp 
b/modules/profile/manifests/cpjobqueue.pp
new file mode 100644
index 000..0592319
--- /dev/null
+++ b/modules/profile/manifests/cpjobqueue.pp
@@ -0,0 +1,57 @@
+# == Class: profile::cpjobqueue
+# 
+# profile::cpjobqueue is the profile class for ChangeProp for JobQueue, a
+# special instance of ChangePropagation that is used to pick up job definitions
+# from the main Kafka cluster (EventBus) and sends them for execution on the
+# jobrunners.
+#
+# === Parameters
+#
+# [*redis_path*]
+#   The path to Redis' UNIX socket. Note that the password is taken directly
+#   from the private repository with secrets.
+#
+# [*jobrunner_host*]
+#   The address of the LVS end point for jobrunners.
+#
+# [*kafka_msg_max_bytes*]
+#   The maximum allowed message size in Kafka. This value *must* match the
+#   brokers' configuration of the same name.
+#
+class profile::cpjobqueue(
+$redis_path  = hiera('profile::cpjobqueue::redis_path'),
+$jobrunner_host  = hiera('profile::cpjobqueue::jobrunner_host'),
+$kafka_msg_max_bytes = hiera('kafka_message_max_bytes'),
+) {
+
+include ::passwords::redis
+require ::changeprop::packages
+
+$kafka_config = kafka_config('main')
+
+system::role { 'cp-jobqueue':
+description => 'ChangePropagation instance for JobQueue jobs',
+}
+
+service::node { 'cp-jobqueue':
+repo  => 'cp-jobqueue',
+port  => 7200,
+healthcheck_url   => '',
+has_spec  => true,
+deployment=> 'scap3',
+deployment_config => true,
+deployment_vars   => {
+broker_list => $kafka_config['brokers']['string'],
+site=> $::site,
+redis_path  => $redis_path,
+redis_pass  => $::passwords::redis::main_password,
+jobrunner_uri   => "${jobrunner_host}/rpc/RunSingleJob.php",
+kafka_max_bytes => $kafka_msg_max_bytes,
+},
+auto_refresh  => false,
+init_restart  => false,
+environment   => {
+'UV_THREADPOOL_SIZE' => 128,
+},
+}
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I78a09d0d99ae20a38d397da8f8a1faf9dd015fe3
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mobrovac 

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[dev-ng]: Scap: Update the list of targets

2017-09-08 Thread Mobrovac (Code Review)

Mobrovac has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/376669 )

Change subject: Scap: Update the list of targets
..

Scap: Update the list of targets

Change-Id: I310326639d41e8901ca7eab4cd36c48099a89aa9
---
M scap/environments/dev-cluster/dev-cluster
M scap/environments/dev-cluster/dev-cluster-canary
2 files changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/restbase/deploy 
refs/changes/69/376669/1

diff --git a/scap/environments/dev-cluster/dev-cluster 
b/scap/environments/dev-cluster/dev-cluster
index eda5232..da8cd74 100644
--- a/scap/environments/dev-cluster/dev-cluster
+++ b/scap/environments/dev-cluster/dev-cluster
@@ -1,2 +1,2 @@
-restbase-dev1002.eqiad.wmnet
-restbase-dev1003.eqiad.wmnet
+restbase-dev1005.eqiad.wmnet
+restbase-dev1006.eqiad.wmnet
diff --git a/scap/environments/dev-cluster/dev-cluster-canary 
b/scap/environments/dev-cluster/dev-cluster-canary
index 8e808a6..c182aa5 100644
--- a/scap/environments/dev-cluster/dev-cluster-canary
+++ b/scap/environments/dev-cluster/dev-cluster-canary
@@ -1 +1 @@
-restbase-dev1001.eqiad.wmnet
+restbase-dev1004.eqiad.wmnet

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I310326639d41e8901ca7eab4cd36c48099a89aa9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/restbase/deploy
Gerrit-Branch: dev-ng
Gerrit-Owner: Mobrovac 

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[dev-ng]: Scap: Update the list of targets

2017-09-08 Thread Mobrovac (Code Review)

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

Change subject: Scap: Update the list of targets
..


Scap: Update the list of targets

Change-Id: I310326639d41e8901ca7eab4cd36c48099a89aa9
---
M scap/environments/dev-cluster/dev-cluster
M scap/environments/dev-cluster/dev-cluster-canary
2 files changed, 3 insertions(+), 3 deletions(-)

Approvals:
  Mobrovac: Verified; Looks good to me, approved



diff --git a/scap/environments/dev-cluster/dev-cluster 
b/scap/environments/dev-cluster/dev-cluster
index eda5232..da8cd74 100644
--- a/scap/environments/dev-cluster/dev-cluster
+++ b/scap/environments/dev-cluster/dev-cluster
@@ -1,2 +1,2 @@
-restbase-dev1002.eqiad.wmnet
-restbase-dev1003.eqiad.wmnet
+restbase-dev1005.eqiad.wmnet
+restbase-dev1006.eqiad.wmnet
diff --git a/scap/environments/dev-cluster/dev-cluster-canary 
b/scap/environments/dev-cluster/dev-cluster-canary
index 8e808a6..c182aa5 100644
--- a/scap/environments/dev-cluster/dev-cluster-canary
+++ b/scap/environments/dev-cluster/dev-cluster-canary
@@ -1 +1 @@
-restbase-dev1001.eqiad.wmnet
+restbase-dev1004.eqiad.wmnet

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I310326639d41e8901ca7eab4cd36c48099a89aa9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/restbase/deploy
Gerrit-Branch: dev-ng
Gerrit-Owner: Mobrovac 
Gerrit-Reviewer: Mobrovac 

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[dev-ng]: Config: Add table_ng options

2017-09-08 Thread Mobrovac (Code Review)

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

Change subject: Config: Add table_ng options
..


Config: Add table_ng options

Change-Id: Ieaa9003d78068be64cc42ee81822a87b4bb4a30a
---
M scap/templates/config.yaml.j2
1 file changed, 5 insertions(+), 2 deletions(-)

Approvals:
  Mobrovac: Verified; Looks good to me, approved



diff --git a/scap/templates/config.yaml.j2 b/scap/templates/config.yaml.j2
index a60f575..56de286 100644
--- a/scap/templates/config.yaml.j2
+++ b/scap/templates/config.yaml.j2
@@ -53,7 +53,7 @@
   x-modules:
 - path: projects/wmf_default.yaml
   options: _options
-table:
+table: _options
   backend: cassandra
   hosts: ['<%= seeds|join("','") %>']
   keyspace: system
@@ -74,6 +74,9 @@
 # Catch-all group
 - name: default.group.local
   domains: /./
+table_ng:
+  <<: *table_options
+  backend: cassandra-ng
 parsoid:
   host: <%= parsoid_uri %>
 action:
@@ -197,4 +200,4 @@
   user_agent: <%= user_agent %>
   ui_name: RESTBase
   ui_url: https://www.mediawiki.org/wiki/RESTBase
-  ui_title: RESTBase docs
\ No newline at end of file
+  ui_title: RESTBase docs

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ieaa9003d78068be64cc42ee81822a87b4bb4a30a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/restbase/deploy
Gerrit-Branch: dev-ng
Gerrit-Owner: Mobrovac 
Gerrit-Reviewer: Mobrovac 

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[dev-ng]: Config: Add table_ng options

2017-09-08 Thread Mobrovac (Code Review)

Mobrovac has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/37 )

Change subject: Config: Add table_ng options
..

Config: Add table_ng options

Change-Id: Ieaa9003d78068be64cc42ee81822a87b4bb4a30a
---
M scap/templates/config.yaml.j2
1 file changed, 5 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/restbase/deploy 
refs/changes/66/37/1

diff --git a/scap/templates/config.yaml.j2 b/scap/templates/config.yaml.j2
index a60f575..56de286 100644
--- a/scap/templates/config.yaml.j2
+++ b/scap/templates/config.yaml.j2
@@ -53,7 +53,7 @@
   x-modules:
 - path: projects/wmf_default.yaml
   options: _options
-table:
+table: _options
   backend: cassandra
   hosts: ['<%= seeds|join("','") %>']
   keyspace: system
@@ -74,6 +74,9 @@
 # Catch-all group
 - name: default.group.local
   domains: /./
+table_ng:
+  <<: *table_options
+  backend: cassandra-ng
 parsoid:
   host: <%= parsoid_uri %>
 action:
@@ -197,4 +200,4 @@
   user_agent: <%= user_agent %>
   ui_name: RESTBase
   ui_url: https://www.mediawiki.org/wiki/RESTBase
-  ui_title: RESTBase docs
\ No newline at end of file
+  ui_title: RESTBase docs

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ieaa9003d78068be64cc42ee81822a87b4bb4a30a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/restbase/deploy
Gerrit-Branch: dev-ng
Gerrit-Owner: Mobrovac 

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[dev-ng]: Update restbase to 5db98f1

2017-09-08 Thread Mobrovac (Code Review)

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

Change subject: Update restbase to 5db98f1
..


Update restbase to 5db98f1

List of changes:
47fd06d Separate mobileapps switch to the new bucket
9b5cc94 Removed the parsoid_bucket for now
5db98f1 Renamed time_to_live to grace_ttl
xxx Update node module dependencies

Change-Id: I0ca6c0ccf8656c20f41105628ada058a998f8bd7
---
M node_modules/bluebird/package.json
M node_modules/cassandra-driver/package.json
M node_modules/cassandra-uuid/package.json
M node_modules/content-type/package.json
M node_modules/core-js/LICENSE
M node_modules/core-js/bower.json
M node_modules/core-js/build/build.ls
M node_modules/core-js/build/index.js
M node_modules/core-js/client/core.js
M node_modules/core-js/client/core.min.js
M node_modules/core-js/client/core.min.js.map
M node_modules/core-js/client/library.js
M node_modules/core-js/client/library.min.js
M node_modules/core-js/client/library.min.js.map
M node_modules/core-js/client/shim.js
M node_modules/core-js/client/shim.min.js
M node_modules/core-js/client/shim.min.js.map
M node_modules/core-js/fn/array/virtual/iterator.js
M node_modules/core-js/fn/array/virtual/values.js
M node_modules/core-js/fn/string/virtual/iterator.js
M node_modules/core-js/library/fn/array/virtual/iterator.js
M node_modules/core-js/library/fn/array/virtual/values.js
M node_modules/core-js/library/fn/string/virtual/iterator.js
M node_modules/core-js/library/modules/_core.js
M node_modules/core-js/library/modules/_promise-resolve.js
M node_modules/core-js/library/modules/es6.promise.js
M node_modules/core-js/library/modules/es6.symbol.js
M node_modules/core-js/library/modules/web.timers.js
M node_modules/core-js/modules/_core.js
M node_modules/core-js/modules/_promise-resolve.js
M node_modules/core-js/modules/es6.promise.js
M node_modules/core-js/modules/es6.symbol.js
M node_modules/core-js/modules/web.timers.js
M node_modules/core-js/package.json
M node_modules/extend/package.json
M node_modules/heapdump/build/Makefile
M 
node_modules/heapdump/build/Release/.deps/Release/obj.target/addon/src/heapdump.o.d
M node_modules/heapdump/build/addon.target.mk
M node_modules/heapdump/build/config.gypi
M node_modules/js-yaml/package.json
M node_modules/json-stable-stringify/package.json
M node_modules/kad/package.json
M node_modules/mime-db/db.json
M node_modules/mime-db/package.json
M node_modules/mime-types/package.json
M node_modules/nan/nan.h
M node_modules/nan/nan_converters.h
M node_modules/nan/nan_maybe_pre_43_inl.h
M node_modules/nan/package.json
A node_modules/restbase-mod-table-cassandra-ng/.eslintrc.yml
A node_modules/restbase-mod-table-cassandra-ng/.jscs.json
A node_modules/restbase-mod-table-cassandra-ng/.jshintignore
A node_modules/restbase-mod-table-cassandra-ng/.jshintrc
A node_modules/restbase-mod-table-cassandra-ng/.npmignore
A node_modules/restbase-mod-table-cassandra-ng/.travis.yml
A node_modules/restbase-mod-table-cassandra-ng/LICENSE
A node_modules/restbase-mod-table-cassandra-ng/index.js
A node_modules/restbase-mod-table-cassandra-ng/lib/db.js
A node_modules/restbase-mod-table-cassandra-ng/lib/dbutils.js
A node_modules/restbase-mod-table-cassandra-ng/lib/index.js
A node_modules/restbase-mod-table-cassandra-ng/lib/schemaMigration.js
A node_modules/restbase-mod-table-cassandra-ng/maintenance/keyspace_name.js
A node_modules/restbase-mod-table-cassandra-ng/maintenance/lib/index.js
A 
node_modules/restbase-mod-table-cassandra-ng/maintenance/thin_out_key_rev_value_data.js
A node_modules/restbase-mod-table-cassandra-ng/maintenance/thin_out_parsoid.js
A node_modules/restbase-mod-table-cassandra-ng/package.json
A node_modules/restbase-mod-table-cassandra-ng/scripts/RashomonDumpImporter.js
A node_modules/restbase-mod-table-cassandra-ng/scripts/direct-request.js
A node_modules/restbase-mod-table-cassandra-ng/scripts/dumpReader.js
A node_modules/restbase-mod-table-cassandra-ng/scripts/package.json
A node_modules/restbase-mod-table-cassandra-ng/scripts/unused_queries.txt
A node_modules/restbase-mod-table-cassandra-ng/table.yaml
A 
node_modules/restbase-mod-table-cassandra-ng/test/functional/backend_migrations.js
A 
node_modules/restbase-mod-table-cassandra-ng/test/functional/config_migrations.js
A node_modules/restbase-mod-table-cassandra-ng/test/functional/replication.js
A node_modules/restbase-mod-table-cassandra-ng/test/index.js
A node_modules/restbase-mod-table-cassandra-ng/test/mocha.opts
A node_modules/restbase-mod-table-cassandra-ng/test/unit/dbutils.js
A node_modules/restbase-mod-table-cassandra-ng/test/utils/test_client.conf.yaml
A node_modules/restbase-mod-table-spec-ng/.jshintignore
A node_modules/restbase-mod-table-spec-ng/.jshintrc
A node_modules/restbase-mod-table-spec-ng/.npmignore
A node_modules/restbase-mod-table-spec-ng/.travis.yml
A node_modules/restbase-mod-table-spec-ng/index.js
A

[MediaWiki-commits] [Gerrit] mediawiki...deploy[dev-ng]: Update restbase to 5db98f1

2017-09-08 Thread Mobrovac (Code Review)

Mobrovac has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/376664 )

Change subject: Update restbase to 5db98f1
..

Update restbase to 5db98f1

List of changes:
47fd06d Separate mobileapps switch to the new bucket
9b5cc94 Removed the parsoid_bucket for now
5db98f1 Renamed time_to_live to grace_ttl
xxx Update node module dependencies

Change-Id: I0ca6c0ccf8656c20f41105628ada058a998f8bd7
---
M node_modules/bluebird/package.json
M node_modules/cassandra-driver/package.json
M node_modules/cassandra-uuid/package.json
M node_modules/content-type/package.json
M node_modules/core-js/LICENSE
M node_modules/core-js/bower.json
M node_modules/core-js/build/build.ls
M node_modules/core-js/build/index.js
M node_modules/core-js/client/core.js
M node_modules/core-js/client/core.min.js
M node_modules/core-js/client/core.min.js.map
M node_modules/core-js/client/library.js
M node_modules/core-js/client/library.min.js
M node_modules/core-js/client/library.min.js.map
M node_modules/core-js/client/shim.js
M node_modules/core-js/client/shim.min.js
M node_modules/core-js/client/shim.min.js.map
M node_modules/core-js/fn/array/virtual/iterator.js
M node_modules/core-js/fn/array/virtual/values.js
M node_modules/core-js/fn/string/virtual/iterator.js
M node_modules/core-js/library/fn/array/virtual/iterator.js
M node_modules/core-js/library/fn/array/virtual/values.js
M node_modules/core-js/library/fn/string/virtual/iterator.js
M node_modules/core-js/library/modules/_core.js
M node_modules/core-js/library/modules/_promise-resolve.js
M node_modules/core-js/library/modules/es6.promise.js
M node_modules/core-js/library/modules/es6.symbol.js
M node_modules/core-js/library/modules/web.timers.js
M node_modules/core-js/modules/_core.js
M node_modules/core-js/modules/_promise-resolve.js
M node_modules/core-js/modules/es6.promise.js
M node_modules/core-js/modules/es6.symbol.js
M node_modules/core-js/modules/web.timers.js
M node_modules/core-js/package.json
M node_modules/extend/package.json
M node_modules/heapdump/build/Makefile
M 
node_modules/heapdump/build/Release/.deps/Release/obj.target/addon/src/heapdump.o.d
M node_modules/heapdump/build/addon.target.mk
M node_modules/heapdump/build/config.gypi
M node_modules/js-yaml/package.json
M node_modules/json-stable-stringify/package.json
M node_modules/kad/package.json
M node_modules/mime-db/db.json
M node_modules/mime-db/package.json
M node_modules/mime-types/package.json
M node_modules/nan/nan.h
M node_modules/nan/nan_converters.h
M node_modules/nan/nan_maybe_pre_43_inl.h
M node_modules/nan/package.json
A node_modules/restbase-mod-table-cassandra-ng/.eslintrc.yml
A node_modules/restbase-mod-table-cassandra-ng/.jscs.json
A node_modules/restbase-mod-table-cassandra-ng/.jshintignore
A node_modules/restbase-mod-table-cassandra-ng/.jshintrc
A node_modules/restbase-mod-table-cassandra-ng/.npmignore
A node_modules/restbase-mod-table-cassandra-ng/.travis.yml
A node_modules/restbase-mod-table-cassandra-ng/LICENSE
A node_modules/restbase-mod-table-cassandra-ng/index.js
A node_modules/restbase-mod-table-cassandra-ng/lib/db.js
A node_modules/restbase-mod-table-cassandra-ng/lib/dbutils.js
A node_modules/restbase-mod-table-cassandra-ng/lib/index.js
A node_modules/restbase-mod-table-cassandra-ng/lib/schemaMigration.js
A node_modules/restbase-mod-table-cassandra-ng/maintenance/keyspace_name.js
A node_modules/restbase-mod-table-cassandra-ng/maintenance/lib/index.js
A 
node_modules/restbase-mod-table-cassandra-ng/maintenance/thin_out_key_rev_value_data.js
A node_modules/restbase-mod-table-cassandra-ng/maintenance/thin_out_parsoid.js
A node_modules/restbase-mod-table-cassandra-ng/package.json
A node_modules/restbase-mod-table-cassandra-ng/scripts/RashomonDumpImporter.js
A node_modules/restbase-mod-table-cassandra-ng/scripts/direct-request.js
A node_modules/restbase-mod-table-cassandra-ng/scripts/dumpReader.js
A node_modules/restbase-mod-table-cassandra-ng/scripts/package.json
A node_modules/restbase-mod-table-cassandra-ng/scripts/unused_queries.txt
A node_modules/restbase-mod-table-cassandra-ng/table.yaml
A 
node_modules/restbase-mod-table-cassandra-ng/test/functional/backend_migrations.js
A 
node_modules/restbase-mod-table-cassandra-ng/test/functional/config_migrations.js
A node_modules/restbase-mod-table-cassandra-ng/test/functional/replication.js
A node_modules/restbase-mod-table-cassandra-ng/test/index.js
A node_modules/restbase-mod-table-cassandra-ng/test/mocha.opts
A node_modules/restbase-mod-table-cassandra-ng/test/unit/dbutils.js
A node_modules/restbase-mod-table-cassandra-ng/test/utils/test_client.conf.yaml
A node_modules/restbase-mod-table-spec-ng/.jshintignore
A node_modules/restbase-mod-table-spec-ng/.jshintrc
A node_modules/restbase-mod-table-spec-ng/.npmignore
A node_modules/restbase-mod-table-spec-ng/.travis.yml
A node_modules/restbase-mod-table-spec-ng/index.js
A

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update restbase to efa0412

2017-09-07 Thread Mobrovac (Code Review)

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

Change subject: Update restbase to efa0412
..


Update restbase to efa0412

List of changes:
94923bf Revert "Expose the revision and type properties"
c46807c Revert "Use MCS /summary endpoint"
efa0412 Revert "Use MCS for text extracts in summary"

Change-Id: I9808d3b6efaa5553c76cd1d3f217ec57cf08b6bd
---
M restbase
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Mobrovac: Verified; Looks good to me, approved



diff --git a/restbase b/restbase
index 7e29f60..efa0412 16
--- a/restbase
+++ b/restbase
@@ -1 +1 @@
-Subproject commit 7e29f604d61d2e3a6123f53bebbe381613c81d9c
+Subproject commit efa0412225221d49e901fdce0ba2ae88cd6ccc11

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9808d3b6efaa5553c76cd1d3f217ec57cf08b6bd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/restbase/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 
Gerrit-Reviewer: Mobrovac 

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update restbase to efa0412

2017-09-07 Thread Mobrovac (Code Review)

Mobrovac has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/376532 )

Change subject: Update restbase to efa0412
..

Update restbase to efa0412

List of changes:
94923bf Revert "Expose the revision and type properties"
c46807c Revert "Use MCS /summary endpoint"
efa0412 Revert "Use MCS for text extracts in summary"

Change-Id: I9808d3b6efaa5553c76cd1d3f217ec57cf08b6bd
---
M restbase
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/restbase/deploy 
refs/changes/32/376532/1

diff --git a/restbase b/restbase
index 7e29f60..efa0412 16
--- a/restbase
+++ b/restbase
@@ -1 +1 @@
-Subproject commit 7e29f604d61d2e3a6123f53bebbe381613c81d9c
+Subproject commit efa0412225221d49e901fdce0ba2ae88cd6ccc11

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9808d3b6efaa5553c76cd1d3f217ec57cf08b6bd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/restbase/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 

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

[MediaWiki-commits] [Gerrit] mediawiki...cp-jobqueue[master]: Initial add of the Scap3 configuration

2017-09-07 Thread Mobrovac (Code Review)

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

Change subject: Initial add of the Scap3 configuration
..


Initial add of the Scap3 configuration

Bug: T175281
Change-Id: I4b925e234d3720c0c90956d32e27ac611d813195
---
A scap/config-files.yaml
A scap/cpjq
A scap/cpjq-canary
A scap/scap.cfg
A scap/templates/config.yaml.j2
A scap/vars.yaml
6 files changed, 147 insertions(+), 0 deletions(-)

Approvals:
  Mobrovac: Verified; Looks good to me, approved



diff --git a/scap/config-files.yaml b/scap/config-files.yaml
new file mode 100644
index 000..0b0ded0
--- /dev/null
+++ b/scap/config-files.yaml
@@ -0,0 +1,5 @@
+---
+/etc/cp-jobqueue/config.yaml:
+  template: config.yaml.j2
+  erb_syntax: True
+  remote_vars: /etc/cp-jobqueue/config-vars.yaml
diff --git a/scap/cpjq b/scap/cpjq
new file mode 100644
index 000..d587d2f
--- /dev/null
+++ b/scap/cpjq
@@ -0,0 +1,9 @@
+scb1001.eqiad.wmnet
+scb1002.eqiad.wmnet
+scb1003.eqiad.wmnet
+scb1004.eqiad.wmnet
+scb2002.codfw.wmnet
+scb2003.codfw.wmnet
+scb2004.codfw.wmnet
+scb2005.codfw.wmnet
+scb2006.codfw.wmnet
diff --git a/scap/cpjq-canary b/scap/cpjq-canary
new file mode 100644
index 000..49e9dd7
--- /dev/null
+++ b/scap/cpjq-canary
@@ -0,0 +1 @@
+scb2001.codfw.wmnet
diff --git a/scap/scap.cfg b/scap/scap.cfg
new file mode 100644
index 000..b2f8ad9
--- /dev/null
+++ b/scap/scap.cfg
@@ -0,0 +1,13 @@
+[global]
+git_repo: cp-jobqueue
+git_deploy_dir: /srv/deployment
+git_repo_user: deploy-service
+ssh_user: deploy-service
+server_groups: canary, default
+canary_dsh_targets: cpjq-canary
+dsh_targets: cpjq
+git_submodules: True
+service_name: cp-jobqueue
+service_port: 7200
+lock_file: /tmp/scap.cpjq.lock
+config_deploy: True
diff --git a/scap/templates/config.yaml.j2 b/scap/templates/config.yaml.j2
new file mode 100644
index 000..8031b95
--- /dev/null
+++ b/scap/templates/config.yaml.j2
@@ -0,0 +1,98 @@
+spec: 
+  x-sub-request-filters:
+- type: default
+  name: http
+  options:
+allow:
+  - pattern: /^https?:\/\//
+forward_headers:
+  user-agent: true
+  title: The Change Propagation for JobQueue root
+  paths:
+<%- if env == 'production' %>
+/{api:sys}/dedupe:
+  x-modules:
+- path: src/sys/deduplicator.js
+  options:
+redis:
+  path: <%= redis_path %>
+  password: <%= redis_pass if redis_pass else '' %>
+<%- endif %>
+/{api:sys}/queue:
+  x-modules:
+- path: src/sys/kafka.js
+  options:
+metadata_broker_list: <%= broker_list %>
+dc_name: <%= site %>
+consumer:
+  # JobQueue jobs might sent messages larget then 1 Meg,
+  # so we increase the max message size in kafka and have to
+  # ajust the consumers accordingly.
+  fetch.message.max.bytes: <%= kafka_max_bytes %>
+concurrency: <%= concurrency %>
+startup_delay: 6
+# no rules for first deployment
+templates: {}
+
+
+# Number of worker processes to spawn.
+# Set to 0 to run everything in a single process without clustering.
+# Use 'ncpu' to run as many workers as there are CPU units
+num_workers: ncpu
+
+# Log error messages and gracefully restart a worker if v8 reports that it
+# uses more heap (note: not RSS) than this many mb.
+worker_heap_limit_mb: 750
+
+# The maximum interval in ms that can pass between two beat messages
+# sent by each worker to the master before it is killed
+worker_heartbeat_timeout: 15000
+
+# Logger info
+logging:
+  level: warn
+  name: <%= log_name %>
+  streams:
+- host: <%= logstash_host %>
+  port: <%= logstash_port %>
+  type: gelf
+- level: info
+  path: <%= log_file %>
+  type: file
+  sampled_levels:
+trace/dedupe: 0.01
+
+# Statsd metrics reporter
+metrics:
+  name: <%= metrics_name %>
+  host: <%= metrics_host %>
+  port: <%= metrics_port %>
+  type: statsd
+
+services:
+  - name: <%= name %>
+# a relative path or the name of an npm package, if different from name
+module: hyperswitch
+# per-service config
+conf:
+  cors: "*"
+  port: <%= port %>
+  # interface: localhost # uncomment to only listen on localhost
+  # URL of the outbound proxy to use (complete with protocol)
+  proxy: <%= proxy if proxy else '' %>
+  # the list of domains for which not to use the proxy defined above
+  # no_proxy_list:
+  #   - domain1.com
+  #   - domain2.org
+  # the list of incoming request headers that can be logged; if left empty,
+  # the following headers are allowed: cache-control, content-length,
+  # content-type, if-match, user-agent, x-request-id
+  # log_header_whitelist:
+  #   - cache-control
+  #   - content-length
+  #   - content-type
+  #   - if-match
+  #   -

[MediaWiki-commits] [Gerrit] mediawiki...cp-jobqueue[master]: Initial add of the Scap3 configuration

2017-09-07 Thread Mobrovac (Code Review)

Mobrovac has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/376527 )

Change subject: Initial add of the Scap3 configuration
..

Initial add of the Scap3 configuration

Bug: T175281
Change-Id: I4b925e234d3720c0c90956d32e27ac611d813195
---
A scap/config-files.yaml
A scap/cpjq
A scap/cpjq-canary
A scap/scap.cfg
A scap/templates/config.yaml.j2
A scap/vars.yaml
6 files changed, 147 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/cp-jobqueue 
refs/changes/27/376527/1

diff --git a/scap/config-files.yaml b/scap/config-files.yaml
new file mode 100644
index 000..0b0ded0
--- /dev/null
+++ b/scap/config-files.yaml
@@ -0,0 +1,5 @@
+---
+/etc/cp-jobqueue/config.yaml:
+  template: config.yaml.j2
+  erb_syntax: True
+  remote_vars: /etc/cp-jobqueue/config-vars.yaml
diff --git a/scap/cpjq b/scap/cpjq
new file mode 100644
index 000..d587d2f
--- /dev/null
+++ b/scap/cpjq
@@ -0,0 +1,9 @@
+scb1001.eqiad.wmnet
+scb1002.eqiad.wmnet
+scb1003.eqiad.wmnet
+scb1004.eqiad.wmnet
+scb2002.codfw.wmnet
+scb2003.codfw.wmnet
+scb2004.codfw.wmnet
+scb2005.codfw.wmnet
+scb2006.codfw.wmnet
diff --git a/scap/cpjq-canary b/scap/cpjq-canary
new file mode 100644
index 000..49e9dd7
--- /dev/null
+++ b/scap/cpjq-canary
@@ -0,0 +1 @@
+scb2001.codfw.wmnet
diff --git a/scap/scap.cfg b/scap/scap.cfg
new file mode 100644
index 000..b2f8ad9
--- /dev/null
+++ b/scap/scap.cfg
@@ -0,0 +1,13 @@
+[global]
+git_repo: cp-jobqueue
+git_deploy_dir: /srv/deployment
+git_repo_user: deploy-service
+ssh_user: deploy-service
+server_groups: canary, default
+canary_dsh_targets: cpjq-canary
+dsh_targets: cpjq
+git_submodules: True
+service_name: cp-jobqueue
+service_port: 7200
+lock_file: /tmp/scap.cpjq.lock
+config_deploy: True
diff --git a/scap/templates/config.yaml.j2 b/scap/templates/config.yaml.j2
new file mode 100644
index 000..8031b95
--- /dev/null
+++ b/scap/templates/config.yaml.j2
@@ -0,0 +1,98 @@
+spec: 
+  x-sub-request-filters:
+- type: default
+  name: http
+  options:
+allow:
+  - pattern: /^https?:\/\//
+forward_headers:
+  user-agent: true
+  title: The Change Propagation for JobQueue root
+  paths:
+<%- if env == 'production' %>
+/{api:sys}/dedupe:
+  x-modules:
+- path: src/sys/deduplicator.js
+  options:
+redis:
+  path: <%= redis_path %>
+  password: <%= redis_pass if redis_pass else '' %>
+<%- endif %>
+/{api:sys}/queue:
+  x-modules:
+- path: src/sys/kafka.js
+  options:
+metadata_broker_list: <%= broker_list %>
+dc_name: <%= site %>
+consumer:
+  # JobQueue jobs might sent messages larget then 1 Meg,
+  # so we increase the max message size in kafka and have to
+  # ajust the consumers accordingly.
+  fetch.message.max.bytes: <%= kafka_max_bytes %>
+concurrency: <%= concurrency %>
+startup_delay: 6
+# no rules for first deployment
+templates: {}
+
+
+# Number of worker processes to spawn.
+# Set to 0 to run everything in a single process without clustering.
+# Use 'ncpu' to run as many workers as there are CPU units
+num_workers: ncpu
+
+# Log error messages and gracefully restart a worker if v8 reports that it
+# uses more heap (note: not RSS) than this many mb.
+worker_heap_limit_mb: 750
+
+# The maximum interval in ms that can pass between two beat messages
+# sent by each worker to the master before it is killed
+worker_heartbeat_timeout: 15000
+
+# Logger info
+logging:
+  level: warn
+  name: <%= log_name %>
+  streams:
+- host: <%= logstash_host %>
+  port: <%= logstash_port %>
+  type: gelf
+- level: info
+  path: <%= log_file %>
+  type: file
+  sampled_levels:
+trace/dedupe: 0.01
+
+# Statsd metrics reporter
+metrics:
+  name: <%= metrics_name %>
+  host: <%= metrics_host %>
+  port: <%= metrics_port %>
+  type: statsd
+
+services:
+  - name: <%= name %>
+# a relative path or the name of an npm package, if different from name
+module: hyperswitch
+# per-service config
+conf:
+  cors: "*"
+  port: <%= port %>
+  # interface: localhost # uncomment to only listen on localhost
+  # URL of the outbound proxy to use (complete with protocol)
+  proxy: <%= proxy if proxy else '' %>
+  # the list of domains for which not to use the proxy defined above
+  # no_proxy_list:
+  #   - domain1.com
+  #   - domain2.org
+  # the list of incoming request headers that can be logged; if left empty,
+  # the following headers are allowed: cache-control, content-length,
+  # content-type, if-match, user-agent, x-request-id
+  # log_header_whitelist:
+  #   - cache-control
+  #   - content-length
+  #   - content-type
+  #   -

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update restbase to 7e29f60

2017-09-07 Thread Mobrovac (Code Review)

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

Change subject: Update restbase to 7e29f60
..


Update restbase to 7e29f60

List of changes:
c361df8 Use MCS for text extracts in summary
0e493fa Use MCS /summary endpoint
7e29f60 Expose the revision and type properties

Change-Id: Ife92e07e68daeb314a75b166c8c3935045386274
---
M restbase
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Mobrovac: Verified; Looks good to me, approved



diff --git a/restbase b/restbase
index 75eb404..7e29f60 16
--- a/restbase
+++ b/restbase
@@ -1 +1 @@
-Subproject commit 75eb40442ab8f6a90417ffad9ad6b922660af3f8
+Subproject commit 7e29f604d61d2e3a6123f53bebbe381613c81d9c

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ife92e07e68daeb314a75b166c8c3935045386274
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/restbase/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 
Gerrit-Reviewer: Mobrovac 
Gerrit-Reviewer: Ppchelko 

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update restbase to 7e29f60

2017-09-07 Thread Mobrovac (Code Review)

Mobrovac has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/376480 )

Change subject: Update restbase to 7e29f60
..

Update restbase to 7e29f60

List of changes:
c361df8 Use MCS for text extracts in summary
0e493fa Use MCS /summary endpoint
7e29f60 Expose the revision and type properties

Change-Id: Ife92e07e68daeb314a75b166c8c3935045386274
---
M restbase
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/restbase/deploy 
refs/changes/80/376480/1

diff --git a/restbase b/restbase
index 75eb404..7e29f60 16
--- a/restbase
+++ b/restbase
@@ -1 +1 @@
-Subproject commit 75eb40442ab8f6a90417ffad9ad6b922660af3f8
+Subproject commit 7e29f604d61d2e3a6123f53bebbe381613c81d9c

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ife92e07e68daeb314a75b166c8c3935045386274
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/restbase/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Scap: Depool the service before performing the checks

2017-09-05 Thread Mobrovac (Code Review)

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

Change subject: Scap: Depool the service before performing the checks
..


Scap: Depool the service before performing the checks

Change-Id: I14b0817be2a3d32e620de5dfcd6ac2aea6e6806d
---
M scap/checks.yaml
1 file changed, 4 insertions(+), 4 deletions(-)

Approvals:
  Mobrovac: Verified; Looks good to me, approved



diff --git a/scap/checks.yaml b/scap/checks.yaml
index 199bcd9..e8db6e4 100644
--- a/scap/checks.yaml
+++ b/scap/checks.yaml
@@ -1,4 +1,8 @@
 checks:
+  depool:
+type: command
+stage: promote
+command: depool-trendingedits
   delay:
 type: command
 stage: restart_service
@@ -8,10 +12,6 @@
 type: nrpe
 stage: restart_service
 command: check_endpoints_trendingedits
-  depool:
-type: command
-stage: promote
-command: depool-trendingedits
   repool:
 type: command
 stage: restart_service

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I14b0817be2a3d32e620de5dfcd6ac2aea6e6806d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/trending-edits/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 
Gerrit-Reviewer: Mobrovac 

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Scap: Depool the service before performing the checks

2017-09-05 Thread Mobrovac (Code Review)

Mobrovac has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/375991 )

Change subject: Scap: Depool the service before performing the checks
..

Scap: Depool the service before performing the checks

Change-Id: I14b0817be2a3d32e620de5dfcd6ac2aea6e6806d
---
M scap/checks.yaml
1 file changed, 4 insertions(+), 4 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/services/trending-edits/deploy 
refs/changes/91/375991/1

diff --git a/scap/checks.yaml b/scap/checks.yaml
index 199bcd9..e8db6e4 100644
--- a/scap/checks.yaml
+++ b/scap/checks.yaml
@@ -1,4 +1,8 @@
 checks:
+  depool:
+type: command
+stage: promote
+command: depool-trendingedits
   delay:
 type: command
 stage: restart_service
@@ -8,10 +12,6 @@
 type: nrpe
 stage: restart_service
 command: check_endpoints_trendingedits
-  depool:
-type: command
-stage: promote
-command: depool-trendingedits
   repool:
 type: command
 stage: restart_service

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I14b0817be2a3d32e620de5dfcd6ac2aea6e6806d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/trending-edits/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Scap: Check endpoints' health after depooling the service

2017-09-05 Thread Mobrovac (Code Review)

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

Change subject: Scap: Check endpoints' health after depooling the service
..


Scap: Check endpoints' health after depooling the service

Change-Id: I3b660626284c09130c7c16db2f4ae4d02f2780f2
---
M scap/checks.yaml
1 file changed, 4 insertions(+), 4 deletions(-)

Approvals:
  Mobrovac: Verified; Looks good to me, approved



diff --git a/scap/checks.yaml b/scap/checks.yaml
index 3c4aa96..b1d5d84 100644
--- a/scap/checks.yaml
+++ b/scap/checks.yaml
@@ -1,12 +1,12 @@
 checks:
-  endpoints:
-type: nrpe
-stage: restart_service
-command: check_endpoints_cxserver
   depool:
 type: command
 stage: promote
 command: depool-cxserver
+  endpoints:
+type: nrpe
+stage: restart_service
+command: check_endpoints_cxserver
   repool:
 type: command
 stage: restart_service

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3b660626284c09130c7c16db2f4ae4d02f2780f2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/cxserver/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 
Gerrit-Reviewer: KartikMistry 
Gerrit-Reviewer: Mobrovac 
Gerrit-Reviewer: Santhosh 

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Scap: Check endpoints' health after depooling the service

2017-09-05 Thread Mobrovac (Code Review)

Mobrovac has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/375989 )

Change subject: Scap: Check endpoints' health after depooling the service
..

Scap: Check endpoints' health after depooling the service

Change-Id: I3b660626284c09130c7c16db2f4ae4d02f2780f2
---
M scap/checks.yaml
1 file changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/cxserver/deploy 
refs/changes/89/375989/1

diff --git a/scap/checks.yaml b/scap/checks.yaml
index 3c4aa96..b1d5d84 100644
--- a/scap/checks.yaml
+++ b/scap/checks.yaml
@@ -1,12 +1,12 @@
 checks:
-  endpoints:
-type: nrpe
-stage: restart_service
-command: check_endpoints_cxserver
   depool:
 type: command
 stage: promote
 command: depool-cxserver
+  endpoints:
+type: nrpe
+stage: restart_service
+command: check_endpoints_cxserver
   repool:
 type: command
 stage: restart_service

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3b660626284c09130c7c16db2f4ae4d02f2780f2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/cxserver/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Scap: Check endpoints' health after depooling the service

2017-09-05 Thread Mobrovac (Code Review)

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

Change subject: Scap: Check endpoints' health after depooling the service
..


Scap: Check endpoints' health after depooling the service

Change-Id: I99bc5430d3523794603a08d611f3c43d5cd77353
---
M scap/checks.yaml
1 file changed, 4 insertions(+), 4 deletions(-)

Approvals:
  Mobrovac: Verified; Looks good to me, approved



diff --git a/scap/checks.yaml b/scap/checks.yaml
index 5e7c857..5a39db5 100644
--- a/scap/checks.yaml
+++ b/scap/checks.yaml
@@ -1,12 +1,12 @@
 checks:
-  endpoints:
-type: nrpe
-stage: restart_service
-command: check_endpoints_citoid
   depool:
 type: command
 stage: promote
 command: depool-citoid
+  endpoints:
+type: nrpe
+stage: restart_service
+command: check_endpoints_citoid
   repool:
 type: command
 stage: restart_service

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I99bc5430d3523794603a08d611f3c43d5cd77353
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/citoid/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 
Gerrit-Reviewer: Mobrovac 

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Scap: Check endpoints' health after depooling the service

2017-09-05 Thread Mobrovac (Code Review)

Mobrovac has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/375988 )

Change subject: Scap: Check endpoints' health after depooling the service
..

Scap: Check endpoints' health after depooling the service

Change-Id: I99bc5430d3523794603a08d611f3c43d5cd77353
---
M scap/checks.yaml
1 file changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/citoid/deploy 
refs/changes/88/375988/1

diff --git a/scap/checks.yaml b/scap/checks.yaml
index 5e7c857..5a39db5 100644
--- a/scap/checks.yaml
+++ b/scap/checks.yaml
@@ -1,12 +1,12 @@
 checks:
-  endpoints:
-type: nrpe
-stage: restart_service
-command: check_endpoints_citoid
   depool:
 type: command
 stage: promote
 command: depool-citoid
+  endpoints:
+type: nrpe
+stage: restart_service
+command: check_endpoints_citoid
   repool:
 type: command
 stage: restart_service

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I99bc5430d3523794603a08d611f3c43d5cd77353
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/citoid/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Scap: Check endpoints' health after depooling the service

2017-09-05 Thread Mobrovac (Code Review)

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

Change subject: Scap: Check endpoints' health after depooling the service
..


Scap: Check endpoints' health after depooling the service

Change-Id: I796434961b360841dc2151a30ffe86ea2d6c081b
---
M scap/checks.yaml
1 file changed, 4 insertions(+), 4 deletions(-)

Approvals:
  Mobrovac: Verified; Looks good to me, approved



diff --git a/scap/checks.yaml b/scap/checks.yaml
index 66bba9d..62f48cc 100644
--- a/scap/checks.yaml
+++ b/scap/checks.yaml
@@ -1,12 +1,12 @@
 checks:
-  endpoints:
-type: nrpe
-stage: restart_service
-command: check_endpoints_graphoid
   depool:
 type: command
 stage: promote
 command: depool-graphoid
+  endpoints:
+type: nrpe
+stage: restart_service
+command: check_endpoints_graphoid
   repool:
 type: command
 stage: restart_service

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I796434961b360841dc2151a30ffe86ea2d6c081b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/graphoid/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 
Gerrit-Reviewer: Mobrovac 

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Scap: Check endpoints' health after depooling the service

2017-09-05 Thread Mobrovac (Code Review)

Mobrovac has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/375987 )

Change subject: Scap: Check endpoints' health after depooling the service
..

Scap: Check endpoints' health after depooling the service

Change-Id: I796434961b360841dc2151a30ffe86ea2d6c081b
---
M scap/checks.yaml
1 file changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/graphoid/deploy 
refs/changes/87/375987/1

diff --git a/scap/checks.yaml b/scap/checks.yaml
index 66bba9d..62f48cc 100644
--- a/scap/checks.yaml
+++ b/scap/checks.yaml
@@ -1,12 +1,12 @@
 checks:
-  endpoints:
-type: nrpe
-stage: restart_service
-command: check_endpoints_graphoid
   depool:
 type: command
 stage: promote
 command: depool-graphoid
+  endpoints:
+type: nrpe
+stage: restart_service
+command: check_endpoints_graphoid
   repool:
 type: command
 stage: restart_service

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I796434961b360841dc2151a30ffe86ea2d6c081b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/graphoid/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Scap: Check the endpoints' health after depooling the service

2017-09-05 Thread Mobrovac (Code Review)

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

Change subject: Scap: Check the endpoints' health after depooling the service
..


Scap: Check the endpoints' health after depooling the service

Change-Id: I090ca4abc80f78c5b2c1c399b7e8fb8898a622ec
---
M scap/checks.yaml
1 file changed, 4 insertions(+), 4 deletions(-)

Approvals:
  Mobrovac: Verified; Looks good to me, approved



diff --git a/scap/checks.yaml b/scap/checks.yaml
index 9d4e526..aeb48a9 100644
--- a/scap/checks.yaml
+++ b/scap/checks.yaml
@@ -1,12 +1,12 @@
 checks:
-  endpoints:
-type: nrpe
-stage: restart_service
-command: check_endpoints_mathoid
   depool:
 type: command
 stage: promote
 command: depool-mathoid
+  endpoints:
+type: nrpe
+stage: restart_service
+command: check_endpoints_mathoid
   repool:
 type: command
 stage: restart_service

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I090ca4abc80f78c5b2c1c399b7e8fb8898a622ec
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/mathoid/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 
Gerrit-Reviewer: Mobrovac 

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Scap: Check the endpoints' health after depooling the service

2017-09-05 Thread Mobrovac (Code Review)

Mobrovac has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/375986 )

Change subject: Scap: Check the endpoints' health after depooling the service
..

Scap: Check the endpoints' health after depooling the service

Change-Id: I090ca4abc80f78c5b2c1c399b7e8fb8898a622ec
---
M scap/checks.yaml
1 file changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/mathoid/deploy 
refs/changes/86/375986/1

diff --git a/scap/checks.yaml b/scap/checks.yaml
index 9d4e526..aeb48a9 100644
--- a/scap/checks.yaml
+++ b/scap/checks.yaml
@@ -1,12 +1,12 @@
 checks:
-  endpoints:
-type: nrpe
-stage: restart_service
-command: check_endpoints_mathoid
   depool:
 type: command
 stage: promote
 command: depool-mathoid
+  endpoints:
+type: nrpe
+stage: restart_service
+command: check_endpoints_mathoid
   repool:
 type: command
 stage: restart_service

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I090ca4abc80f78c5b2c1c399b7e8fb8898a622ec
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/mathoid/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Scap: Check the endpoints' health after depooling the service

2017-09-05 Thread Mobrovac (Code Review)

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

Change subject: Scap: Check the endpoints' health after depooling the service
..


Scap: Check the endpoints' health after depooling the service

Change-Id: I32c34a0ae376c553f9607ce8d40a2fcd65309a27
---
M scap/checks.yaml
1 file changed, 4 insertions(+), 4 deletions(-)

Approvals:
  Mobrovac: Verified; Looks good to me, approved



diff --git a/scap/checks.yaml b/scap/checks.yaml
index 3a1c68c..7511f79 100644
--- a/scap/checks.yaml
+++ b/scap/checks.yaml
@@ -1,12 +1,12 @@
 checks:
-  endpoints:
-type: nrpe
-stage: restart_service
-command: check_endpoints_mobileapps
   depool:
 type: command
 stage: promote
 command: depool-mobileapps
+  endpoints:
+type: nrpe
+stage: restart_service
+command: check_endpoints_mobileapps
   repool:
 type: command
 stage: restart_service

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I32c34a0ae376c553f9607ce8d40a2fcd65309a27
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/mobileapps/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 
Gerrit-Reviewer: BearND 
Gerrit-Reviewer: Mobrovac 

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Scap: Check the endpoints' health after depooling the service

2017-09-05 Thread Mobrovac (Code Review)

Mobrovac has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/375985 )

Change subject: Scap: Check the endpoints' health after depooling the service
..

Scap: Check the endpoints' health after depooling the service

Change-Id: I32c34a0ae376c553f9607ce8d40a2fcd65309a27
---
M scap/checks.yaml
1 file changed, 4 insertions(+), 4 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/services/mobileapps/deploy 
refs/changes/85/375985/1

diff --git a/scap/checks.yaml b/scap/checks.yaml
index 3a1c68c..7511f79 100644
--- a/scap/checks.yaml
+++ b/scap/checks.yaml
@@ -1,12 +1,12 @@
 checks:
-  endpoints:
-type: nrpe
-stage: restart_service
-command: check_endpoints_mobileapps
   depool:
 type: command
 stage: promote
 command: depool-mobileapps
+  endpoints:
+type: nrpe
+stage: restart_service
+command: check_endpoints_mobileapps
   repool:
 type: command
 stage: restart_service

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I32c34a0ae376c553f9607ce8d40a2fcd65309a27
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/mobileapps/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Scap: Check the endpoints' health after depooling the service

2017-09-05 Thread Mobrovac (Code Review)

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

Change subject: Scap: Check the endpoints' health after depooling the service
..


Scap: Check the endpoints' health after depooling the service

Change-Id: Ifcab921ee10009874ac500b2cfe12f628bb715e4
---
M scap/checks.yaml
1 file changed, 4 insertions(+), 4 deletions(-)

Approvals:
  Mobrovac: Verified; Looks good to me, approved



diff --git a/scap/checks.yaml b/scap/checks.yaml
index e703342..7b8c378 100644
--- a/scap/checks.yaml
+++ b/scap/checks.yaml
@@ -1,12 +1,12 @@
 checks:
-  endpoints:
-type: nrpe
-stage: restart_service
-command: check_endpoints_recommendation_api
   depool:
 type: command
 stage: promote
 command: depool-recommendation-api
+  endpoints:
+type: nrpe
+stage: restart_service
+command: check_endpoints_recommendation_api
   repool:
 type: command
 stage: restart_service

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifcab921ee10009874ac500b2cfe12f628bb715e4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/recommendation-api/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 
Gerrit-Reviewer: Mobrovac 
Gerrit-Reviewer: Nschaaf 

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Scap: Check the endpoints' health after depooling the service

2017-09-05 Thread Mobrovac (Code Review)

Mobrovac has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/375984 )

Change subject: Scap: Check the endpoints' health after depooling the service
..

Scap: Check the endpoints' health after depooling the service

Change-Id: Ifcab921ee10009874ac500b2cfe12f628bb715e4
---
M scap/checks.yaml
1 file changed, 4 insertions(+), 4 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/services/recommendation-api/deploy 
refs/changes/84/375984/1

diff --git a/scap/checks.yaml b/scap/checks.yaml
index e703342..7b8c378 100644
--- a/scap/checks.yaml
+++ b/scap/checks.yaml
@@ -1,12 +1,12 @@
 checks:
-  endpoints:
-type: nrpe
-stage: restart_service
-command: check_endpoints_recommendation_api
   depool:
 type: command
 stage: promote
 command: depool-recommendation-api
+  endpoints:
+type: nrpe
+stage: restart_service
+command: check_endpoints_recommendation_api
   repool:
 type: command
 stage: restart_service

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifcab921ee10009874ac500b2cfe12f628bb715e4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/recommendation-api/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: [Config] Respect the fetch.message.max.bytes from puppet.

2017-09-05 Thread Mobrovac (Code Review)

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

Change subject: [Config] Respect the fetch.message.max.bytes from puppet.
..


[Config] Respect the fetch.message.max.bytes from puppet.

Change-Id: I9f842bfa8b96f5779b08f0465a927f6f83914bcf
Depends-On: Ice77027db74e67c519ce305e99ea22c3ff2c7b07
---
M scap/templates/config.yaml.j2
M scap/vars.yaml
2 files changed, 6 insertions(+), 0 deletions(-)

Approvals:
  Mobrovac: Verified; Looks good to me, approved



diff --git a/scap/templates/config.yaml.j2 b/scap/templates/config.yaml.j2
index 3a54adb..2a1a23a 100644
--- a/scap/templates/config.yaml.j2
+++ b/scap/templates/config.yaml.j2
@@ -57,6 +57,11 @@
   options:
 metadata_broker_list: <%= broker_list %>
 dc_name: <%= site %>
+consumer:
+  # JobQueue jobs might sent messages larget then 1 Meg,
+  # so we increase the max message size in kafka and have to
+  # ajust the consumers accordingly.
+  fetch.message.max.bytes: <%= kafka_max_bytes %>
 concurrency: <%= concurrency %>
 startup_delay: 6
 templates:
diff --git a/scap/vars.yaml b/scap/vars.yaml
index 54cf1fb..4b5ebfd 100644
--- a/scap/vars.yaml
+++ b/scap/vars.yaml
@@ -22,3 +22,4 @@
 redis_path: /var/run/redis.sock
 redis_pass:
 env: production
+kafka_max_bytes: 4194304
\ No newline at end of file

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9f842bfa8b96f5779b08f0465a927f6f83914bcf
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/services/change-propagation/deploy
Gerrit-Branch: master
Gerrit-Owner: Ppchelko 
Gerrit-Reviewer: Mobrovac 
Gerrit-Reviewer: Ppchelko 

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Scap: Bug fix: Repool the service only after checking it

2017-09-04 Thread Mobrovac (Code Review)

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

Change subject: Scap: Bug fix: Repool the service only after checking it
..


Scap: Bug fix: Repool the service only after checking it

Change-Id: I687e6cb35d3b2a9ecec1ff75ce23c3c90ab6a7ac
---
M scap/checks.yaml
1 file changed, 4 insertions(+), 4 deletions(-)

Approvals:
  Mobrovac: Verified; Looks good to me, approved



diff --git a/scap/checks.yaml b/scap/checks.yaml
index b017077..596302d 100644
--- a/scap/checks.yaml
+++ b/scap/checks.yaml
@@ -3,11 +3,11 @@
 type: command
 stage: promote
 command: depool-restbase
-  repool:
-type: command
-stage: restart_service
-command: pool-restbase
   endpoints:
 type: nrpe
 stage: restart_service
 command: check_endpoints_restbase
+  repool:
+type: command
+stage: restart_service
+command: pool-restbase

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I687e6cb35d3b2a9ecec1ff75ce23c3c90ab6a7ac
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/restbase/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 
Gerrit-Reviewer: Mobrovac 

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Scap: Bug fix: Repool the service only after checking it

2017-09-04 Thread Mobrovac (Code Review)

Mobrovac has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/375830 )

Change subject: Scap: Bug fix: Repool the service only after checking it
..

Scap: Bug fix: Repool the service only after checking it

Change-Id: I687e6cb35d3b2a9ecec1ff75ce23c3c90ab6a7ac
---
M scap/checks.yaml
1 file changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/restbase/deploy 
refs/changes/30/375830/1

diff --git a/scap/checks.yaml b/scap/checks.yaml
index b017077..596302d 100644
--- a/scap/checks.yaml
+++ b/scap/checks.yaml
@@ -3,11 +3,11 @@
 type: command
 stage: promote
 command: depool-restbase
-  repool:
-type: command
-stage: restart_service
-command: pool-restbase
   endpoints:
 type: nrpe
 stage: restart_service
 command: check_endpoints_restbase
+  repool:
+type: command
+stage: restart_service
+command: pool-restbase

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I687e6cb35d3b2a9ecec1ff75ce23c3c90ab6a7ac
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/restbase/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Scap: Remove restbase10(0[89]|10) and restbase200[135] from ...

2017-09-04 Thread Mobrovac (Code Review)

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

Change subject: Scap: Remove restbase10(0[89]|10) and restbase200[135] from 
targets
..


Scap: Remove restbase10(0[89]|10) and restbase200[135] from targets

Bug: T169939
Change-Id: I24926e1fd20972bb513678c349e78773b25649bb
---
M scap/target-canary
M scap/targets
2 files changed, 1 insertion(+), 7 deletions(-)

Approvals:
  Mobrovac: Verified; Looks good to me, approved



diff --git a/scap/target-canary b/scap/target-canary
index 2259262..e92b640 100644
--- a/scap/target-canary
+++ b/scap/target-canary
@@ -1,2 +1,2 @@
-restbase2001.codfw.wmnet
+restbase2002.codfw.wmnet
 restbase1007.eqiad.wmnet
diff --git a/scap/targets b/scap/targets
index 7a8ee83..92c4036 100644
--- a/scap/targets
+++ b/scap/targets
@@ -1,6 +1,3 @@
-restbase1008.eqiad.wmnet
-restbase1009.eqiad.wmnet
-restbase1010.eqiad.wmnet
 restbase1011.eqiad.wmnet
 restbase1012.eqiad.wmnet
 restbase1013.eqiad.wmnet
@@ -9,10 +6,7 @@
 restbase1016.eqiad.wmnet
 restbase1017.eqiad.wmnet
 restbase1018.eqiad.wmnet
-restbase2002.codfw.wmnet
-restbase2003.codfw.wmnet
 restbase2004.codfw.wmnet
-restbase2005.codfw.wmnet
 restbase2006.codfw.wmnet
 restbase2007.codfw.wmnet
 restbase2008.codfw.wmnet

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I24926e1fd20972bb513678c349e78773b25649bb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/restbase/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 
Gerrit-Reviewer: Eevans 
Gerrit-Reviewer: Mobrovac 
Gerrit-Reviewer: Ppchelko 

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Scap: Remove restbase10(0[89]|10) and restbase200[135] from ...

2017-09-04 Thread Mobrovac (Code Review)

Mobrovac has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/375829 )

Change subject: Scap: Remove restbase10(0[89]|10) and restbase200[135] from 
targets
..

Scap: Remove restbase10(0[89]|10) and restbase200[135] from targets

Bug: T169939
Change-Id: I24926e1fd20972bb513678c349e78773b25649bb
---
M scap/target-canary
M scap/targets
2 files changed, 1 insertion(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/restbase/deploy 
refs/changes/29/375829/1

diff --git a/scap/target-canary b/scap/target-canary
index 2259262..e92b640 100644
--- a/scap/target-canary
+++ b/scap/target-canary
@@ -1,2 +1,2 @@
-restbase2001.codfw.wmnet
+restbase2002.codfw.wmnet
 restbase1007.eqiad.wmnet
diff --git a/scap/targets b/scap/targets
index 7a8ee83..92c4036 100644
--- a/scap/targets
+++ b/scap/targets
@@ -1,6 +1,3 @@
-restbase1008.eqiad.wmnet
-restbase1009.eqiad.wmnet
-restbase1010.eqiad.wmnet
 restbase1011.eqiad.wmnet
 restbase1012.eqiad.wmnet
 restbase1013.eqiad.wmnet
@@ -9,10 +6,7 @@
 restbase1016.eqiad.wmnet
 restbase1017.eqiad.wmnet
 restbase1018.eqiad.wmnet
-restbase2002.codfw.wmnet
-restbase2003.codfw.wmnet
 restbase2004.codfw.wmnet
-restbase2005.codfw.wmnet
 restbase2006.codfw.wmnet
 restbase2007.codfw.wmnet
 restbase2008.codfw.wmnet

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I24926e1fd20972bb513678c349e78773b25649bb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/restbase/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: RESTBase: Remove restbase10(0[89]|10) from the list of seeds

2017-09-04 Thread Mobrovac (Code Review)

Mobrovac has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/375825 )

Change subject: RESTBase: Remove restbase10(0[89]|10) from the list of seeds
..

RESTBase: Remove restbase10(0[89]|10) from the list of seeds

Bug: T169939
Change-Id: I2bf1ff002a35361e98c80479b86f1186c0b948ab
---
M hieradata/role/eqiad/restbase/production.yaml
1 file changed, 0 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/25/375825/1

diff --git a/hieradata/role/eqiad/restbase/production.yaml 
b/hieradata/role/eqiad/restbase/production.yaml
index 7ba16e0..8a859ed 100644
--- a/hieradata/role/eqiad/restbase/production.yaml
+++ b/hieradata/role/eqiad/restbase/production.yaml
@@ -1,12 +1,6 @@
 profile::restbase::seeds:
   - restbase1007-a.eqiad.wmnet
   - restbase1007-b.eqiad.wmnet
-  - restbase1008-a.eqiad.wmnet
-  - restbase1008-b.eqiad.wmnet
-  - restbase1009-a.eqiad.wmnet
-  - restbase1009-b.eqiad.wmnet
-  - restbase1010-a.eqiad.wmnet
-  - restbase1010-b.eqiad.wmnet
   - restbase1011-a.eqiad.wmnet
   - restbase1011-b.eqiad.wmnet
   - restbase1012-a.eqiad.wmnet
@@ -16,9 +10,6 @@
 # used for rate limiting
 profile::restbase::hosts:
   - restbase1007.eqiad.wmnet
-  - restbase1008.eqiad.wmnet
-  - restbase1009.eqiad.wmnet
-  - restbase1010.eqiad.wmnet
   - restbase1011.eqiad.wmnet
   - restbase1012.eqiad.wmnet
   - restbase1013.eqiad.wmnet

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2bf1ff002a35361e98c80479b86f1186c0b948ab
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mobrovac 

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: [Config] Lower the cache TTL for the trending endpoint

2017-09-04 Thread Mobrovac (Code Review)

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

Change subject: [Config] Lower the cache TTL for the trending endpoint
..


[Config] Lower the cache TTL for the trending endpoint

Change-Id: Ic16ecabe30868d07512ccf89b539c17a2b7a050b
---
M scap/templates/config.yaml.j2
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Mobrovac: Verified; Looks good to me, approved



diff --git a/scap/templates/config.yaml.j2 b/scap/templates/config.yaml.j2
index 9012345..bfea643 100644
--- a/scap/templates/config.yaml.j2
+++ b/scap/templates/config.yaml.j2
@@ -115,7 +115,7 @@
 <<: *default_options
 trending:
   host: <%= trendingedits_uri %>
-  cache_control: s-maxage=1800, max-age=1800
+  cache_control: s-maxage=300, max-age=60
 
 # A different project template, sharing configuration options.
 wikimedia.org: 
@@ -195,4 +195,4 @@
   user_agent: <%= user_agent %>
   ui_name: RESTBase
   ui_url: https://www.mediawiki.org/wiki/RESTBase
-  ui_title: RESTBase docs
+  ui_title: RESTBase docs
\ No newline at end of file

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic16ecabe30868d07512ccf89b539c17a2b7a050b
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/services/restbase/deploy
Gerrit-Branch: master
Gerrit-Owner: Ppchelko 
Gerrit-Reviewer: BearND 
Gerrit-Reviewer: GWicke 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Mobrovac 
Gerrit-Reviewer: Zoranzoki21 

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: [Config] Only rerender mobile-sections for wikipedia domains

2017-08-23 Thread Mobrovac (Code Review)

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

Change subject: [Config] Only rerender mobile-sections for wikipedia domains
..


[Config] Only rerender mobile-sections for wikipedia domains

The mobile-sections are only used for wikipedia domain,
so it doesn't make sence to rerender that for other projects.

Change-Id: Ia8c75bbc271373b3777f504e5b8de1c07c48c610
---
M scap/templates/config.yaml.j2
1 file changed, 73 insertions(+), 45 deletions(-)

Approvals:
  Mobrovac: Verified; Looks good to me, approved



diff --git a/scap/templates/config.yaml.j2 b/scap/templates/config.yaml.j2
index 563aed7..ab68df6 100644
--- a/scap/templates/config.yaml.j2
+++ b/scap/templates/config.yaml.j2
@@ -102,11 +102,9 @@
 match:
   meta:
 uri: 
'/^https?:\/\/[^\/]+\/api\/rest_v1\/page\/html\/([^/]+)$/'
+domain: '/\.wikipedia\.org$/'
   tags:
 - restbase
-match_not:
-  meta:
-domain: /\.wikidata\.org$/
 exec:
   method: get
   # Don't encode title since it should be already encoded
@@ -625,26 +623,39 @@
 
   on_wikidata_description_change:
 topic: change-prop.wikidata.resource-change
-match:
-  meta:
-uri: '/https?:\/\/[^\/]+\/wiki\/(?.+)/'
-  tags: [ 'wikidata' ]
-exec:
-  - method: get
-uri: '<%= restbase_uri 
%>/{{message.meta.domain}}/v1/page/summary/{{match.meta.uri.title}}'
-headers:
-  cache-control: no-cache
-query:
-  redirect: false
-  - method: get
-uri: '<%= restbase_uri 
%>/{{message.meta.domain}}/v1/page/mobile-sections/{{match.meta.uri.title}}'
-headers:
-  cache-control: no-cache
-query:
-  redirect: false
+cases:
+  - match:
+  meta:
+uri: '/https?:\/\/[^\/]+\/wiki\/(?.+)/'
+domain: '/\.wikipedia\.org$/'
+  tags: [ 'wikidata' ]
+exec:
+  - method: get
+uri: '<%= restbase_uri 
%>/{{message.meta.domain}}/v1/page/summary/{{match.meta.uri.title}}'
+headers:
+  cache-control: no-cache
+query:
+  redirect: false
+  - method: get
+uri: '<%= restbase_uri 
%>/{{message.meta.domain}}/v1/page/mobile-sections/{{match.meta.uri.title}}'
+headers:
+  cache-control: no-cache
+query:
+  redirect: false
+  - match:
+  meta:
+uri: '/https?:\/\/[^\/]+\/wiki\/(?.+)/'
+  tags: [ 'wikidata' ]
+exec:
+  - method: get
+uri: '<%= restbase_uri 
%>/{{message.meta.domain}}/v1/page/summary/{{match.meta.uri.title}}'
+headers:
+  cache-control: no-cache
+query:
+  redirect: false
 
   # Rerender summary when pageimages page property change
-  page_images:
+  page_images_summary:
 topic: mediawiki.page-properties-change
 # We don't support 'OR' in the match section, so workaround it 
by 2 cases with identical exec
 cases:
@@ -659,18 +670,12 @@
   domain: /\.wikidata\.org$/
 page_namespace: 120
 exec:
-  - method: get
-uri: '<%= restbase_uri 
%>/{{message.meta.domain}}/v1/page/summary/{message.page_title}'
-headers:
-  cache-control: no-cache
-query:
-  redirect: false
-  - method: get
-uri: '<%= restbase_uri 
%>/{{message.meta.domain}}/v1/page/mobile-sections/{message.page_title}'
-headers:
-  cache-control: no-cache
-query:
-  redirect: false
+  method: get
+  uri: '<%= restbase_uri 
%>/{{message.meta.domain}}/v1/page/summary/{message.page_title}'
+  headers:
+cache-control: no-cache
+  query:
+

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Transcludes: Ramp up the concurrency to 200

2017-08-23 Thread Mobrovac (Code Review)

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

Change subject: Transcludes: Ramp up the concurrency to 200
..


Transcludes: Ramp up the concurrency to 200

Bug: T169939
Change-Id: I3c190811dd1f5f10d33141c227ab1e35780bd7dd
---
M scap/templates/config.yaml.j2
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Mobrovac: Verified; Looks good to me, approved



diff --git a/scap/templates/config.yaml.j2 b/scap/templates/config.yaml.j2
index 563aed7..575de3f 100644
--- a/scap/templates/config.yaml.j2
+++ b/scap/templates/config.yaml.j2
@@ -331,7 +331,7 @@
   redirect: false
 
   on_transclusion_update:
-concurrency: <%= concurrency * 2 %>
+concurrency: <%= concurrency * 4 %>
 topic: change-prop.transcludes.resource-change
 limiters:
   blacklist: 'html:{message.meta.uri}'

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3c190811dd1f5f10d33141c227ab1e35780bd7dd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/change-propagation/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 
Gerrit-Reviewer: Mobrovac 

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Transcludes: Ramp up the concurrency to 200

2017-08-23 Thread Mobrovac (Code Review)

Mobrovac has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/373335 )

Change subject: Transcludes: Ramp up the concurrency to 200
..

Transcludes: Ramp up the concurrency to 200

Bug: T169939
Change-Id: I3c190811dd1f5f10d33141c227ab1e35780bd7dd
---
M scap/templates/config.yaml.j2
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/services/change-propagation/deploy 
refs/changes/35/373335/1

diff --git a/scap/templates/config.yaml.j2 b/scap/templates/config.yaml.j2
index 563aed7..575de3f 100644
--- a/scap/templates/config.yaml.j2
+++ b/scap/templates/config.yaml.j2
@@ -331,7 +331,7 @@
   redirect: false
 
   on_transclusion_update:
-concurrency: <%= concurrency * 2 %>
+concurrency: <%= concurrency * 4 %>
 topic: change-prop.transcludes.resource-change
 limiters:
   blacklist: 'html:{message.meta.uri}'

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3c190811dd1f5f10d33141c227ab1e35780bd7dd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/change-propagation/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: [Config] Block Module namespace rerenders.

2017-08-17 Thread Mobrovac (Code Review)

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

Change subject: [Config] Block Module namespace rerenders.
..


[Config] Block Module namespace rerenders.

The 828 Module namespace is used to store the Scribunto
Lua scripts which are counted as a dependency on any page
that accessed them during parsing creating enormous update chains.

The output of these scripts is dynamic, so edot of the script
shouldn't really provoke a rerender of all the pages using it -
it shouldn't be expected due to the dynamic nature of this.

Change-Id: Ibcee40c1768a71b1070afc591f89a1a745e51124
---
M scap/templates/config.yaml.j2
1 file changed, 13 insertions(+), 2 deletions(-)

Approvals:
  Mobrovac: Verified; Looks good to me, approved



diff --git a/scap/templates/config.yaml.j2 b/scap/templates/config.yaml.j2
index 4f2af31..563aed7 100644
--- a/scap/templates/config.yaml.j2
+++ b/scap/templates/config.yaml.j2
@@ -201,6 +201,11 @@
   - meta:
   domain: /\.wikidata\.org$/
 page_namespace: 120
+# Block Scribunto Module dependencies as they create a lot 
of load
+# with supposingly very low actual effect
+  - meta:
+  domain: '/wiktionary\.org$/'
+page_namespace: 828
 exec:
   - method: get
 uri: '<%= restbase_uri 
%>/{{message.meta.domain}}/v1/page/html/{message.page_title}/{{message.rev_id}}'
@@ -352,8 +357,14 @@
   meta:
 schema_uri: 'continue/1'
 match_not:
-  meta:
-domain: ceb.wikipedia.org
+  - meta:
+  domain: ceb.wikipedia.org
+  - original_event:
+  # Block Scribunto Module dependencies as they create 
a lot of load
+  # with supposingly very low actual effect
+  meta:
+domain: '/wiktionary\.org$/'
+  page_namespace: 828
 exec:
   method: post
   uri: 
'/sys/links/transcludes/{message.original_event.page_title}'

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibcee40c1768a71b1070afc591f89a1a745e51124
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/services/change-propagation/deploy
Gerrit-Branch: master
Gerrit-Owner: Ppchelko 
Gerrit-Reviewer: Mobrovac 

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Lower the concurrency of transcludes to 100

2017-08-17 Thread Mobrovac (Code Review)

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

Change subject: Lower the concurrency of transcludes to 100
..


Lower the concurrency of transcludes to 100

The current rate of transcludes is around 200 per second. Lower this to
100 concurrent requests (which would set the limit to 100 per second,
given the average transclude re-render time) in order to release
pressure off of Cassandra while we are reshaping the cluster.

Bug: T169939
Change-Id: I196a9c65ad66fd8ed2fb578e957b9c597c2f7269
---
M scap/templates/config.yaml.j2
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Mobrovac: Verified; Looks good to me, approved



diff --git a/scap/templates/config.yaml.j2 b/scap/templates/config.yaml.j2
index 01216e9..4f2af31 100644
--- a/scap/templates/config.yaml.j2
+++ b/scap/templates/config.yaml.j2
@@ -326,7 +326,7 @@
   redirect: false
 
   on_transclusion_update:
-concurrency: <%= concurrency * 8 %>
+concurrency: <%= concurrency * 2 %>
 topic: change-prop.transcludes.resource-change
 limiters:
   blacklist: 'html:{message.meta.uri}'

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I196a9c65ad66fd8ed2fb578e957b9c597c2f7269
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/change-propagation/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 
Gerrit-Reviewer: Mobrovac 
Gerrit-Reviewer: Ppchelko 

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Lower the concurrency of transcludes to 100

2017-08-17 Thread Mobrovac (Code Review)

Mobrovac has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/372452 )

Change subject: Lower the concurrency of transcludes to 100
..

Lower the concurrency of transcludes to 100

The current rate of transcludes is around 200 per second. Lower this to
100 concurrent requests (which would set the limit to 100 per second,
given the average transclude re-render time) in order to release
pressure off of Cassandra while we are reshaping the cluster.

Bug: T169939
Change-Id: I196a9c65ad66fd8ed2fb578e957b9c597c2f7269
---
M scap/templates/config.yaml.j2
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/services/change-propagation/deploy 
refs/changes/52/372452/1

diff --git a/scap/templates/config.yaml.j2 b/scap/templates/config.yaml.j2
index 01216e9..4f2af31 100644
--- a/scap/templates/config.yaml.j2
+++ b/scap/templates/config.yaml.j2
@@ -326,7 +326,7 @@
   redirect: false
 
   on_transclusion_update:
-concurrency: <%= concurrency * 8 %>
+concurrency: <%= concurrency * 2 %>
 topic: change-prop.transcludes.resource-change
 limiters:
   blacklist: 'html:{message.meta.uri}'

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I196a9c65ad66fd8ed2fb578e957b9c597c2f7269
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/change-propagation/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: PDF Render: Lower the concurrency to 4

2017-08-16 Thread Mobrovac (Code Review)

Mobrovac has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/372156 )

Change subject: PDF Render: Lower the concurrency to 4
..

PDF Render: Lower the concurrency to 4

We have been having problems with the service's restart procedure where
it would block during the window-creation process. However, that usually
happens after at least 4 windows have been created. Since our current
rate is 2 reqs/sec and the service is deployed on all SCB hosts, it
should be safe to lower the concurrency to 4 to minimise the restart
hangs.

Bug: T159922
Change-Id: I19d2b00ac01b64d1e89e3b885c9ea6ff42f33976
---
M modules/role/manifests/pdfrender.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/56/372156/1

diff --git a/modules/role/manifests/pdfrender.pp 
b/modules/role/manifests/pdfrender.pp
index 21cf388..657def0c 100644
--- a/modules/role/manifests/pdfrender.pp
+++ b/modules/role/manifests/pdfrender.pp
@@ -9,7 +9,7 @@
 
 class { '::pdfrender':
 port=> $port,
-no_browsers => 8,
+no_browsers => 4,
 running => $is_active,
 }
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I19d2b00ac01b64d1e89e3b885c9ea6ff42f33976
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mobrovac 

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update restbase to 85a4dc4

2017-08-15 Thread Mobrovac (Code Review)

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

Change subject: Update restbase to 85a4dc4
..


Update restbase to 85a4dc4

List of changes:
591e3d9 Remove references to old parsoid tables
834ea61 Removed the 'options.bucket_type' setting
85a4dc4 Commented out the data-mw bucket

Change-Id: Idbe53835644fb7f3fd8643f9c896b9e54f9c09f9
---
M restbase
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Mobrovac: Verified; Looks good to me, approved



diff --git a/restbase b/restbase
index 71baac4..85a4dc4 16
--- a/restbase
+++ b/restbase
@@ -1 +1 @@
-Subproject commit 71baac4b17422dfa2f27a03e54a17c8f670ee2b6
+Subproject commit 85a4dc44613fb156a791538d8175af51aa7035c3

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Idbe53835644fb7f3fd8643f9c896b9e54f9c09f9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/restbase/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 
Gerrit-Reviewer: Mobrovac 

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

< 1 2 3 4 5 6 7 8 9 10 >

201 - 300 of 2130 matches

Mail list logo