[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad.php: Depool db1077
Marostegui has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/386578 ) Change subject: db-eqiad.php: Depool db1077 .. db-eqiad.php: Depool db1077 Going to fix data drifts on db1077 Bug: T164488 Change-Id: I3df4b2bef739ebf19f00eaad2816a2d88ae3f8a4 --- M wmf-config/db-eqiad.php 1 file changed, 7 insertions(+), 7 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/78/386578/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index a29d769..2fe4f71 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -126,8 +126,8 @@ # 'db1038' => 0, # B2 1.4TB 64GB, vslow, dump, old master # T172679 'db1044' => 0, # B2 1.4TB 64GB, #Temporary master for db1095 - new sanitarium #T150802 'db1072' => 0, # B2 2.8TB 160GB, vslow, dump, old master - 'db1077' => 400, # B1 3.6TB 512GB #temporary special slave - T172679 - 'db1078' => 500, # C3 3.6TB 512GB + # 'db1077' => 400, # B1 3.6TB 512GB #temporary special slave - T172679 #T164488 + 'db1078' => 500, # C3 3.6TB 512GB #temporary special slave #T164488 # 'db1103' => 0, # A3 3.6TB 512GB, # not needed on s3 - has db1035's data that we have to checksum ], 's4' => [ @@ -312,19 +312,19 @@ 'db1072' => 1, ], 'watchlist' => [ - 'db1077' => 1, + 'db1078' => 1, ], 'recentchanges' => [ - 'db1077' => 1, + 'db1078' => 1, ], 'recentchangeslinked' => [ - 'db1077' => 1, + 'db1078' => 1, ], 'contributions' => [ - 'db1077' => 1, + 'db1078' => 1, ], 'logpager' => [ - 'db1077' => 1, + 'db1078' => 1, ], ], 's4' => [ -- To view, visit https://gerrit.wikimedia.org/r/386578 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3df4b2bef739ebf19f00eaad2816a2d88ae3f8a4 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Marostegui ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: Bump RemexHtml coverage limit to 90 minutes
Legoktm has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/386579 ) Change subject: Bump RemexHtml coverage limit to 90 minutes .. Bump RemexHtml coverage limit to 90 minutes 78% complete in 65 minutes, theoretically will take 83.3 minutes to complete. Change-Id: I51b0c74e50ff30da45c1cd75ec25a5b915fd7b6d --- M jjb/misc.yaml 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/79/386579/1 diff --git a/jjb/misc.yaml b/jjb/misc.yaml index 50f3dea..99e8bb4 100644 --- a/jjb/misc.yaml +++ b/jjb/misc.yaml @@ -46,7 +46,7 @@ - zuul wrappers: - timeout: - timeout: 65 # mins. Increased due to lots of tests + timeout: 90 # mins. Increased due to lots of tests fail: true - job: -- To view, visit https://gerrit.wikimedia.org/r/386579 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I51b0c74e50ff30da45c1cd75ec25a5b915fd7b6d Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Legoktm ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: Bump RemexHtml coverage limit to 90 minutes
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/386579 ) Change subject: Bump RemexHtml coverage limit to 90 minutes .. Bump RemexHtml coverage limit to 90 minutes 78% complete in 65 minutes, theoretically will take 83.3 minutes to complete. Change-Id: I51b0c74e50ff30da45c1cd75ec25a5b915fd7b6d --- M jjb/misc.yaml 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/jjb/misc.yaml b/jjb/misc.yaml index 50f3dea..99e8bb4 100644 --- a/jjb/misc.yaml +++ b/jjb/misc.yaml @@ -46,7 +46,7 @@ - zuul wrappers: - timeout: - timeout: 65 # mins. Increased due to lots of tests + timeout: 90 # mins. Increased due to lots of tests fail: true - job: -- To view, visit https://gerrit.wikimedia.org/r/386579 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I51b0c74e50ff30da45c1cd75ec25a5b915fd7b6d Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Legoktm Gerrit-Reviewer: Hashar Gerrit-Reviewer: Legoktm Gerrit-Reviewer: Paladox Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad.php: Depool db1077
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/386578 ) Change subject: db-eqiad.php: Depool db1077 .. db-eqiad.php: Depool db1077 Going to fix data drifts on db1077 Bug: T164488 Change-Id: I3df4b2bef739ebf19f00eaad2816a2d88ae3f8a4 --- M wmf-config/db-eqiad.php 1 file changed, 7 insertions(+), 7 deletions(-) Approvals: Marostegui: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index a29d769..2fe4f71 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -126,8 +126,8 @@ # 'db1038' => 0, # B2 1.4TB 64GB, vslow, dump, old master # T172679 'db1044' => 0, # B2 1.4TB 64GB, #Temporary master for db1095 - new sanitarium #T150802 'db1072' => 0, # B2 2.8TB 160GB, vslow, dump, old master - 'db1077' => 400, # B1 3.6TB 512GB #temporary special slave - T172679 - 'db1078' => 500, # C3 3.6TB 512GB + # 'db1077' => 400, # B1 3.6TB 512GB #temporary special slave - T172679 #T164488 + 'db1078' => 500, # C3 3.6TB 512GB #temporary special slave #T164488 # 'db1103' => 0, # A3 3.6TB 512GB, # not needed on s3 - has db1035's data that we have to checksum ], 's4' => [ @@ -312,19 +312,19 @@ 'db1072' => 1, ], 'watchlist' => [ - 'db1077' => 1, + 'db1078' => 1, ], 'recentchanges' => [ - 'db1077' => 1, + 'db1078' => 1, ], 'recentchangeslinked' => [ - 'db1077' => 1, + 'db1078' => 1, ], 'contributions' => [ - 'db1077' => 1, + 'db1078' => 1, ], 'logpager' => [ - 'db1077' => 1, + 'db1078' => 1, ], ], 's4' => [ -- To view, visit https://gerrit.wikimedia.org/r/386578 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3df4b2bef739ebf19f00eaad2816a2d88ae3f8a4 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Marostegui Gerrit-Reviewer: Jcrespo Gerrit-Reviewer: Marostegui Gerrit-Reviewer: Urbanecm Gerrit-Reviewer: Zoranzoki21 Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: Sync MediaWiki core's clover.xml to docs.wm.o
Legoktm has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/386580 ) Change subject: Sync MediaWiki core's clover.xml to docs.wm.o .. Sync MediaWiki core's clover.xml to docs.wm.o Change-Id: I8f450c1ac3a63cca1b8c398a4e82bbf91f9ed765 --- M jjb/mediawiki.yaml 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/80/386580/1 diff --git a/jjb/mediawiki.yaml b/jjb/mediawiki.yaml index 842b2ab..fcbfb67 100644 --- a/jjb/mediawiki.yaml +++ b/jjb/mediawiki.yaml @@ -372,6 +372,10 @@ # can be a PHP Fatal error, of a segfault, for example. test -f cover/index.html +if [ -s "log/clover.xml" ]; then +cp log/clover.xml "$WORKSPACE/cover/clover.xml" +fi + - cover-publish: src: 'cover' dest: 'mediawiki-core/$ZUUL_BRANCH/php' -- To view, visit https://gerrit.wikimedia.org/r/386580 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8f450c1ac3a63cca1b8c398a4e82bbf91f9ed765 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Legoktm ___ 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 "db-eqiad.php: Depool db1077"
Hello Urbanecm, jenkins-bot, Jcrespo, Zoranzoki21, I'd like you to do a code review. Please visit https://gerrit.wikimedia.org/r/386581 to review the following change. Change subject: Revert "db-eqiad.php: Depool db1077" .. Revert "db-eqiad.php: Depool db1077" This reverts commit 330aac777478cf57054eb1a292af7a9dac9d17b3. Change-Id: I81399c5d23418b9e3f3cbbc31213d8e15d5fa81e --- M wmf-config/db-eqiad.php 1 file changed, 7 insertions(+), 7 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/81/386581/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 2fe4f71..a29d769 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -126,8 +126,8 @@ # 'db1038' => 0, # B2 1.4TB 64GB, vslow, dump, old master # T172679 'db1044' => 0, # B2 1.4TB 64GB, #Temporary master for db1095 - new sanitarium #T150802 'db1072' => 0, # B2 2.8TB 160GB, vslow, dump, old master - # 'db1077' => 400, # B1 3.6TB 512GB #temporary special slave - T172679 #T164488 - 'db1078' => 500, # C3 3.6TB 512GB #temporary special slave #T164488 + 'db1077' => 400, # B1 3.6TB 512GB #temporary special slave - T172679 + 'db1078' => 500, # C3 3.6TB 512GB # 'db1103' => 0, # A3 3.6TB 512GB, # not needed on s3 - has db1035's data that we have to checksum ], 's4' => [ @@ -312,19 +312,19 @@ 'db1072' => 1, ], 'watchlist' => [ - 'db1078' => 1, + 'db1077' => 1, ], 'recentchanges' => [ - 'db1078' => 1, + 'db1077' => 1, ], 'recentchangeslinked' => [ - 'db1078' => 1, + 'db1077' => 1, ], 'contributions' => [ - 'db1078' => 1, + 'db1077' => 1, ], 'logpager' => [ - 'db1078' => 1, + 'db1077' => 1, ], ], 's4' => [ -- To view, visit https://gerrit.wikimedia.org/r/386581 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I81399c5d23418b9e3f3cbbc31213d8e15d5fa81e Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Marostegui Gerrit-Reviewer: Jcrespo Gerrit-Reviewer: Urbanecm Gerrit-Reviewer: Zoranzoki21 Gerrit-Reviewer: jenkins-bot <> ___ 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 "db-eqiad.php: Depool db1077"
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/386581 ) Change subject: Revert "db-eqiad.php: Depool db1077" .. Revert "db-eqiad.php: Depool db1077" This reverts commit 330aac777478cf57054eb1a292af7a9dac9d17b3. Change-Id: I81399c5d23418b9e3f3cbbc31213d8e15d5fa81e --- M wmf-config/db-eqiad.php 1 file changed, 7 insertions(+), 7 deletions(-) Approvals: Marostegui: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 2fe4f71..a29d769 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -126,8 +126,8 @@ # 'db1038' => 0, # B2 1.4TB 64GB, vslow, dump, old master # T172679 'db1044' => 0, # B2 1.4TB 64GB, #Temporary master for db1095 - new sanitarium #T150802 'db1072' => 0, # B2 2.8TB 160GB, vslow, dump, old master - # 'db1077' => 400, # B1 3.6TB 512GB #temporary special slave - T172679 #T164488 - 'db1078' => 500, # C3 3.6TB 512GB #temporary special slave #T164488 + 'db1077' => 400, # B1 3.6TB 512GB #temporary special slave - T172679 + 'db1078' => 500, # C3 3.6TB 512GB # 'db1103' => 0, # A3 3.6TB 512GB, # not needed on s3 - has db1035's data that we have to checksum ], 's4' => [ @@ -312,19 +312,19 @@ 'db1072' => 1, ], 'watchlist' => [ - 'db1078' => 1, + 'db1077' => 1, ], 'recentchanges' => [ - 'db1078' => 1, + 'db1077' => 1, ], 'recentchangeslinked' => [ - 'db1078' => 1, + 'db1077' => 1, ], 'contributions' => [ - 'db1078' => 1, + 'db1077' => 1, ], 'logpager' => [ - 'db1078' => 1, + 'db1077' => 1, ], ], 's4' => [ -- To view, visit https://gerrit.wikimedia.org/r/386581 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I81399c5d23418b9e3f3cbbc31213d8e15d5fa81e Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Marostegui Gerrit-Reviewer: Jcrespo Gerrit-Reviewer: Marostegui Gerrit-Reviewer: Urbanecm Gerrit-Reviewer: Zoranzoki21 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...WikibaseLexeme[master]: Make all getForms methods return FormSet instead of array
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/383799 )
Change subject: Make all getForms methods return FormSet instead of array
..
Make all getForms methods return FormSet instead of array
Again mostly for consistency. The class exists now. Why should the getter
do something different than the constructor?
Bug: T178994
Change-Id: I1af251f6af22bc4a4f02acc45a7442ae5f630414
---
M src/DataModel/Lexeme.php
M src/DataModel/LexemePatchAccess.php
M src/DataModel/Serialization/StorageLexemeSerializer.php
M src/DataModel/Services/Diff/LexemeDiffer.php
M src/View/FormsView.php
M src/View/LexemeViewFactory.php
M tests/phpunit/composer/DataModel/FormSetTest.php
M tests/phpunit/composer/DataModel/LexemePatchAccessTest.php
M tests/phpunit/composer/DataModel/LexemeTest.php
M tests/phpunit/composer/DataModel/Services/Diff/LexemeDifferPatcherTest.php
M tests/phpunit/composer/ErisGenerators/LexemeGenerator.php
M tests/phpunit/mediawiki/Api/AddFormRequestTest.php
M tests/phpunit/mediawiki/Api/AddFormTest.php
M tests/phpunit/mediawiki/ChangeOp/ChangeOpAddFormTest.php
M tests/phpunit/mediawiki/View/FormsViewTest.php
15 files changed, 70 insertions(+), 66 deletions(-)
Approvals:
WMDE-leszek: Looks good to me, approved
Jakob: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/src/DataModel/Lexeme.php b/src/DataModel/Lexeme.php
index f68af31..90f766d 100644
--- a/src/DataModel/Lexeme.php
+++ b/src/DataModel/Lexeme.php
@@ -251,10 +251,10 @@
}
/**
-* @return Form[]
+* @return FormSet
*/
public function getForms() {
- return $this->forms->toArray();
+ return $this->forms;
}
/**
@@ -349,7 +349,7 @@
} finally {
$lexemePatchAccess->close();
}
- $newFormSet = new FormSet( $lexemePatchAccess->getForms() );
+ $newFormSet = $lexemePatchAccess->getForms();
$newNextFormId = $lexemePatchAccess->getNextFormId();
$this->assertCorrectNextFormIdIsGiven( $newNextFormId,
$newFormSet );
diff --git a/src/DataModel/LexemePatchAccess.php
b/src/DataModel/LexemePatchAccess.php
index 8f1464f..77ed3e6 100644
--- a/src/DataModel/LexemePatchAccess.php
+++ b/src/DataModel/LexemePatchAccess.php
@@ -63,10 +63,10 @@
}
/**
-* @return Form[]
+* @return FormSet
*/
public function getForms() {
- return $this->forms->toArray();
+ return $this->forms;
}
/**
diff --git a/src/DataModel/Serialization/StorageLexemeSerializer.php
b/src/DataModel/Serialization/StorageLexemeSerializer.php
index c39879b..7c7ec79 100644
--- a/src/DataModel/Serialization/StorageLexemeSerializer.php
+++ b/src/DataModel/Serialization/StorageLexemeSerializer.php
@@ -7,8 +7,8 @@
use Serializers\Exceptions\UnsupportedObjectException;
use Serializers\Serializer;
use UnexpectedValueException;
+use Wikibase\Lexeme\DataModel\FormSet;
use Wikibase\Lexeme\DataModel\Lexeme;
-use Wikibase\Lexeme\DataModel\Form;
use Wikibase\Lexeme\DataModel\Sense;
/**
@@ -112,17 +112,18 @@
}
/**
-* @param Form[] $forms
+* @param FormSet $forms
*
* @return array[]
*/
- private function serializeForms( array $forms ) {
- return array_map(
- function ( Form $form ) {
- return $this->formSerializer->serialize( $form
);
- },
- $forms
- );
+ private function serializeForms( FormSet $forms ) {
+ $serialization = [];
+
+ foreach ( $forms->toArray() as $form ) {
+ $serialization[] = $this->formSerializer->serialize(
$form );
+ }
+
+ return $serialization;
}
/**
diff --git a/src/DataModel/Services/Diff/LexemeDiffer.php
b/src/DataModel/Services/Diff/LexemeDiffer.php
index f33531f..1494c7e 100644
--- a/src/DataModel/Services/Diff/LexemeDiffer.php
+++ b/src/DataModel/Services/Diff/LexemeDiffer.php
@@ -11,6 +11,7 @@
use Wikibase\DataModel\Services\Diff\EntityDifferStrategy;
use Wikibase\DataModel\Services\Diff\StatementListDiffer;
use Wikibase\Lexeme\DataModel\Form;
+use Wikibase\Lexeme\DataModel\FormSet;
use Wikibase\Lexeme\DataModel\Lexeme;
use Wikimedia\Assert\Assert;
use InvalidArgumentException;
@@ -149,12 +150,12 @@
}
/**
-* @param Form[] $from
-* @param Form[] $to
+* @param FormSet $from
+* @param FormSet $to
*
* @return Diff;
*/
- private function getFormsDiff( array $from, array $to ) {
+ private function getFormsDiff( FormSet $from, FormSet $to ) {
$diffe
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Disables TwoColConflict waiting for compatibility with Proof...
Tpt has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/386582 ) Change subject: Disables TwoColConflict waiting for compatibility with ProofreadPage .. Disables TwoColConflict waiting for compatibility with ProofreadPage Bug: T179056 Change-Id: Ib176f8348796a54f72c51dcbe26b14b845774276 --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/82/386582/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 45dd5a3..f9ec0e1 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -17759,6 +17759,7 @@ 'wmgUseTwoColConflict' => [ 'default' => true, + 'wikisource' => false // T179056 ], 'wmgUseUserMerge' => [ -- To view, visit https://gerrit.wikimedia.org/r/386582 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib176f8348796a54f72c51dcbe26b14b845774276 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Tpt ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Skip StatementBoostScoreBuilderTest if Cirrus is not installed
Hoo man has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/386583 )
Change subject: Skip StatementBoostScoreBuilderTest if Cirrus is not installed
..
Skip StatementBoostScoreBuilderTest if Cirrus is not installed
Will fix Travis:
https://travis-ci.org/wikimedia/mediawiki-extensions-Wikibase/jobs/292748251
Change-Id: Ic4a1f29f1b1cd423770416ad6c0f393c5984b9c8
---
M repo/tests/phpunit/includes/Search/Elastic/StatementBoostScoreBuilderTest.php
1 file changed, 5 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/83/386583/1
diff --git
a/repo/tests/phpunit/includes/Search/Elastic/StatementBoostScoreBuilderTest.php
b/repo/tests/phpunit/includes/Search/Elastic/StatementBoostScoreBuilderTest.php
index bddeb74..c39bcc0 100644
---
a/repo/tests/phpunit/includes/Search/Elastic/StatementBoostScoreBuilderTest.php
+++
b/repo/tests/phpunit/includes/Search/Elastic/StatementBoostScoreBuilderTest.php
@@ -2,6 +2,7 @@
namespace Wikibase\Repo\Search\Elastic\Tests;
+use CirrusSearch;
use CirrusSearch\HashSearchConfig;
use CirrusSearch\Search\FunctionScoreDecorator;
use CirrusSearch\Search\SearchContext;
@@ -54,6 +55,10 @@
* @dataProvider statementBoostProvider
*/
public function testStatementBoosts( $weight, array $settings, array
$functions ) {
+ if ( !class_exists( CirrusSearch::class ) ) {
+ $this->markTestSkipped( 'CirrusSearch needed.' );
+ }
+
$config = new HashSearchConfig( [] );
$context = new SearchContext( $config, null );
$builder = new StatementBoostScoreBuilder( $context, $weight,
$settings );
--
To view, visit https://gerrit.wikimedia.org/r/386583
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic4a1f29f1b1cd423770416ad6c0f393c5984b9c8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Hoo man
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] maps...deploy[master]: Replace direct dependencies with kartotherian dependency.
Gehel has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/386584 )
Change subject: Replace direct dependencies with kartotherian dependency.
..
Replace direct dependencies with kartotherian dependency.
All dependencies can be resolved as transitive dependencies of kartotherian.
We could probably remove a bunch more things from package.json, but my
understanding of it is limited.
Bug: T162241
Change-Id: I39bf394dd15f60c2d5892a1af370ba770d4973ec
---
M package.json
1 file changed, 1 insertion(+), 34 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/maps/kartotherian/deploy
refs/changes/84/386584/1
diff --git a/package.json b/package.json
index 8bf6339..1ed064e 100644
--- a/package.json
+++ b/package.json
@@ -50,40 +50,7 @@
},
"dependencies": {
-"bluebird": "^3.3.5",
-"body-parser": "^1.15.0",
-"bunyan": "^1.8.1",
-"cassandra-uuid": "^0.0.2",
-"compression": "^1.6.1",
-"domino": "^1.0.24",
-"express": "^4.13.4",
-"js-yaml": "^3.6.0",
-"preq": "^0.4.11",
-"service-runner": "^2.2.5",
-"node-pre-gyp": "~0.6.25",
-
-"mapnik": "~3.5.0",
-"tilelive": "~5.12.2",
-"tilelive-bridge": "~2.3.1",
-"tilelive-vector": "~3.9.3",
-
-"kartotherian-core":
"git+https://github.com/kartotherian/kartotherian-core.git";,
-"kartotherian-server":
"git+https://github.com/kartotherian/kartotherian-server.git";,
-"kartotherian-autogen":
"git+https://github.com/kartotherian/kartotherian-autogen.git";,
-"kartotherian-cassandra":
"git+https://github.com/kartotherian/kartotherian-cassandra.git";,
-"kartotherian-postgres":
"git+https://github.com/kartotherian/kartotherian-postgres.git";,
-"kartotherian-demultiplexer":
"git+https://github.com/kartotherian/kartotherian-demultiplexer.git";,
-"kartotherian-geoshapes":
"git+https://github.com/kartotherian/kartotherian-geoshapes.git";,
-"kartotherian-layermixer":
"git+https://github.com/kartotherian/kartotherian-layermixer.git";,
-"kartotherian-maki":
"git+https://github.com/kartotherian/kartotherian-maki.git";,
-"kartotherian-overzoom":
"git+https://github.com/kartotherian/kartotherian-overzoom.git";,
-"kartotherian-snapshot":
"git+https://github.com/kartotherian/kartotherian-snapshot.git";,
-"kartotherian-substantial":
"git+https://github.com/kartotherian/kartotherian-substantial.git";,
-"osm-bright-source":
"git+https://github.com/kartotherian/osm-bright.tm2source.git";,
-"osm-bright-style":
"git+https://github.com/kartotherian/osm-bright.tm2.git";
- },
- "optionalDependencies": {
-"bunyan-prettystream": "*"
+"kartotherian": "git+https://github.com/kartotherian/kartotherian.git";
},
"devDependencies": {
"extend": "^3.0.0",
--
To view, visit https://gerrit.wikimedia.org/r/386584
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I39bf394dd15f60c2d5892a1af370ba770d4973ec
Gerrit-PatchSet: 1
Gerrit-Project: maps/kartotherian/deploy
Gerrit-Branch: master
Gerrit-Owner: Gehel
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] maps...deploy[master]: Add meddo and ClearTables as deploy dependencies.
Gehel has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/386585 )
Change subject: Add meddo and ClearTables as deploy dependencies.
..
Add meddo and ClearTables as deploy dependencies.
Note that meddo and ClearTables are not actual npm packages _yet_.
Bug: T162241
Change-Id: I6e1b7cf0198bf01941626ff5d37d240ecac3bc45
---
M package.json
1 file changed, 3 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/maps/kartotherian/deploy
refs/changes/85/386585/1
diff --git a/package.json b/package.json
index 1ed064e..fdb1c0f 100644
--- a/package.json
+++ b/package.json
@@ -50,7 +50,9 @@
},
"dependencies": {
-"kartotherian": "git+https://github.com/kartotherian/kartotherian.git";
+"kartotherian": "git+https://github.com/kartotherian/kartotherian.git";,
+"meddo": "git+https://github.com/kartotherian/meddo.git";,
+"ClearTables": "git+https://github.com/ClearTables/ClearTables.git";
},
"devDependencies": {
"extend": "^3.0.0",
--
To view, visit https://gerrit.wikimedia.org/r/386585
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6e1b7cf0198bf01941626ff5d37d240ecac3bc45
Gerrit-PatchSet: 1
Gerrit-Project: maps/kartotherian/deploy
Gerrit-Branch: master
Gerrit-Owner: Gehel
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Skip StatementBoostScoreBuilderTest if Cirrus is not installed
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/386583 )
Change subject: Skip StatementBoostScoreBuilderTest if Cirrus is not installed
..
Skip StatementBoostScoreBuilderTest if Cirrus is not installed
Will fix Travis:
https://travis-ci.org/wikimedia/mediawiki-extensions-Wikibase/jobs/292748251
Change-Id: Ic4a1f29f1b1cd423770416ad6c0f393c5984b9c8
---
M repo/tests/phpunit/includes/Search/Elastic/StatementBoostScoreBuilderTest.php
1 file changed, 5 insertions(+), 0 deletions(-)
Approvals:
WMDE-leszek: Looks good to me, approved
jenkins-bot: Verified
diff --git
a/repo/tests/phpunit/includes/Search/Elastic/StatementBoostScoreBuilderTest.php
b/repo/tests/phpunit/includes/Search/Elastic/StatementBoostScoreBuilderTest.php
index bddeb74..c39bcc0 100644
---
a/repo/tests/phpunit/includes/Search/Elastic/StatementBoostScoreBuilderTest.php
+++
b/repo/tests/phpunit/includes/Search/Elastic/StatementBoostScoreBuilderTest.php
@@ -2,6 +2,7 @@
namespace Wikibase\Repo\Search\Elastic\Tests;
+use CirrusSearch;
use CirrusSearch\HashSearchConfig;
use CirrusSearch\Search\FunctionScoreDecorator;
use CirrusSearch\Search\SearchContext;
@@ -54,6 +55,10 @@
* @dataProvider statementBoostProvider
*/
public function testStatementBoosts( $weight, array $settings, array
$functions ) {
+ if ( !class_exists( CirrusSearch::class ) ) {
+ $this->markTestSkipped( 'CirrusSearch needed.' );
+ }
+
$config = new HashSearchConfig( [] );
$context = new SearchContext( $config, null );
$builder = new StatementBoostScoreBuilder( $context, $weight,
$settings );
--
To view, visit https://gerrit.wikimedia.org/r/386583
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic4a1f29f1b1cd423770416ad6c0f393c5984b9c8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Hoo man
Gerrit-Reviewer: Smalyshev
Gerrit-Reviewer: Thiemo Mättig (WMDE)
Gerrit-Reviewer: WMDE-leszek
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: profile::mariadb::misc::eventlogging::database: set correct ...
Elukey has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/386586 ) Change subject: profile::mariadb::misc::eventlogging::database: set correct mysql params .. profile::mariadb::misc::eventlogging::database: set correct mysql params Bug: T177405 Change-Id: I22e316217bcfbd63450b1a4aad978c4fa3c14db9 --- M modules/profile/manifests/mariadb/misc/eventlogging/database.pp 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/86/386586/1 diff --git a/modules/profile/manifests/mariadb/misc/eventlogging/database.pp b/modules/profile/manifests/mariadb/misc/eventlogging/database.pp index 89fa337..189560a 100644 --- a/modules/profile/manifests/mariadb/misc/eventlogging/database.pp +++ b/modules/profile/manifests/mariadb/misc/eventlogging/database.pp @@ -54,6 +54,8 @@ config=> 'profile/mariadb/misc/eventlogging/eventlogging.my.cnf.erb', datadir => '/srv/sqldata', tmpdir=> '/srv/tmp', +socket=> '/run/mysqld/mysqld.sock', +port => 3306 read_only => 0, ssl => 'puppet-cert', p_s => 'off', -- To view, visit https://gerrit.wikimedia.org/r/386586 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I22e316217bcfbd63450b1a4aad978c4fa3c14db9 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Elukey ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: graphite: cleanup cassandra metrics
Filippo Giunchedi has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/386587 )
Change subject: graphite: cleanup cassandra metrics
..
graphite: cleanup cassandra metrics
Bug: T179057
Change-Id: I0cef0b9a94ba59b41608f6248def5ad2e2552ad5
---
M modules/role/manifests/graphite/production.pp
1 file changed, 6 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/87/386587/1
diff --git a/modules/role/manifests/graphite/production.pp
b/modules/role/manifests/graphite/production.pp
index 4b97ee7..dc0bef2 100644
--- a/modules/role/manifests/graphite/production.pp
+++ b/modules/role/manifests/graphite/production.pp
@@ -56,6 +56,12 @@
keep_days => 15,
}
+# Cassandra metrics - T179057
+graphite::whisper_cleanup { 'graphite-cassandra':
+directory => "${storage_dir}/whisper/cassandra",
+keep_days => 182,
+}
+
$graphite_hosts = [
'graphite1001.eqiad.wmnet',
'graphite1003.eqiad.wmnet',
--
To view, visit https://gerrit.wikimedia.org/r/386587
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0cef0b9a94ba59b41608f6248def5ad2e2552ad5
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: mediawiki: Disable rebuildTermSqlIndex
Ladsgroup has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/386588 )
Change subject: mediawiki: Disable rebuildTermSqlIndex
..
mediawiki: Disable rebuildTermSqlIndex
It's done now \o/
Bug: T163551
Change-Id: Ie0efd36df08981aadf63d26bfc6d91cb71766e7c
---
M modules/mediawiki/manifests/maintenance/wikidata.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/88/386588/1
diff --git a/modules/mediawiki/manifests/maintenance/wikidata.pp
b/modules/mediawiki/manifests/maintenance/wikidata.pp
index df409ec..526fd35 100644
--- a/modules/mediawiki/manifests/maintenance/wikidata.pp
+++ b/modules/mediawiki/manifests/maintenance/wikidata.pp
@@ -56,7 +56,7 @@
# rebuildTermSqlIndex is temporarilly stopped
cron { 'wikibase-rebuildTermSqlIndex':
-ensure => $ensure,
+ensure => absent,
command => '/usr/bin/timeout 3500s /usr/local/bin/mwscript
extensions/Wikidata/extensions/Wikibase/repo/maintenance/rebuildTermSqlIndex.php
--wiki wikidatawiki --entity-type=item --deduplicate-terms --batch-size 500
--sleep 10 --from-id $(/bin/ls -t /var/log/wikidata/rebuildTermSqlIndex.log
/var/log/wikidata/rebuildTermSqlIndex.log*[0-9] | /usr/bin/xargs -d "\n"
/usr/bin/tac 2> /dev/null | /usr/bin/awk \'/Processed up to page (\d+?)/ {
print $5 }\' | head -n1) >> /var/log/wikidata/rebuildTermSqlIndex.log 2>&1',
user=> $::mediawiki::users::web,
minute => 30,
--
To view, visit https://gerrit.wikimedia.org/r/386588
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie0efd36df08981aadf63d26bfc6d91cb71766e7c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ladsgroup
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: cache: set timeout_idle on text and upload
Ema has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/385985 ) Change subject: cache: set timeout_idle on text and upload .. cache: set timeout_idle on text and upload The misc cluster has been running with timeout_idle set to 120s on varnish-be for a while now. Set timeout_idle to 120s on text and upload varnish backends as well. Bug: T159429 Ref: https://varnish-cache.org/docs/trunk/reference/varnishd.html#timeout-idle Change-Id: Ie4e23b5cf9e45bdfcfc1832c1616b034af7678d2 --- M hieradata/role/common/cache/text.yaml M hieradata/role/common/cache/upload.yaml 2 files changed, 2 insertions(+), 0 deletions(-) Approvals: Ema: Verified; Looks good to me, approved BBlack: Looks good to me, but someone else must approve diff --git a/hieradata/role/common/cache/text.yaml b/hieradata/role/common/cache/text.yaml index 87fb290..602a755 100644 --- a/hieradata/role/common/cache/text.yaml +++ b/hieradata/role/common/cache/text.yaml @@ -90,6 +90,7 @@ - default_ttl=86400 profile::cache::base::be_runtime_params: - default_ttl=86400 +- timeout_idle=120 - nuke_limit=1000 - lru_interval=31 # Profile::cache::ssl::unified diff --git a/hieradata/role/common/cache/upload.yaml b/hieradata/role/common/cache/upload.yaml index 97c92c1..f7c40d8 100644 --- a/hieradata/role/common/cache/upload.yaml +++ b/hieradata/role/common/cache/upload.yaml @@ -62,6 +62,7 @@ - default_ttl=86400 profile::cache::base::be_runtime_params: - default_ttl=86400 +- timeout_idle=120 - nuke_limit=1000 - lru_interval=31 # Profile::cache::ssl::unified -- To view, visit https://gerrit.wikimedia.org/r/385985 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie4e23b5cf9e45bdfcfc1832c1616b034af7678d2 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Ema Gerrit-Reviewer: BBlack Gerrit-Reviewer: Ema 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...BlueSpiceExtensions[master]: Removed "ExtendedEditbar" due to end of development
Robert Vogel has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/386589 )
Change subject: Removed "ExtendedEditbar" due to end of development
..
Removed "ExtendedEditbar" due to end of development
In BlueSpice 3.0 WMF VisualEditor and WikiEditor extensions will
be used.
Change-Id: Ia8af664b6c0567ce4e2a96b9840126197d60af2c
---
D ExtendedEditBar/ExtendedEditBar.class.php
D ExtendedEditBar/ExtendedEditBar.setup.php
D ExtendedEditBar/extension.json
D ExtendedEditBar/i18n/ais.json
D ExtendedEditBar/i18n/ast.json
D ExtendedEditBar/i18n/ba.json
D ExtendedEditBar/i18n/bn.json
D ExtendedEditBar/i18n/br.json
D ExtendedEditBar/i18n/ca.json
D ExtendedEditBar/i18n/ce.json
D ExtendedEditBar/i18n/ckb.json
D ExtendedEditBar/i18n/de.json
D ExtendedEditBar/i18n/diq.json
D ExtendedEditBar/i18n/en.json
D ExtendedEditBar/i18n/es.json
D ExtendedEditBar/i18n/eu.json
D ExtendedEditBar/i18n/fa.json
D ExtendedEditBar/i18n/fr.json
D ExtendedEditBar/i18n/fy.json
D ExtendedEditBar/i18n/gl.json
D ExtendedEditBar/i18n/he.json
D ExtendedEditBar/i18n/hu.json
D ExtendedEditBar/i18n/ia.json
D ExtendedEditBar/i18n/id.json
D ExtendedEditBar/i18n/it.json
D ExtendedEditBar/i18n/ja.json
D ExtendedEditBar/i18n/ko.json
D ExtendedEditBar/i18n/ksh.json
D ExtendedEditBar/i18n/ku-latn.json
D ExtendedEditBar/i18n/lb.json
D ExtendedEditBar/i18n/lt.json
D ExtendedEditBar/i18n/lv.json
D ExtendedEditBar/i18n/mk.json
D ExtendedEditBar/i18n/mwl.json
D ExtendedEditBar/i18n/nan.json
D ExtendedEditBar/i18n/nds-nl.json
D ExtendedEditBar/i18n/nl.json
D ExtendedEditBar/i18n/oc.json
D ExtendedEditBar/i18n/pl.json
D ExtendedEditBar/i18n/ps.json
D ExtendedEditBar/i18n/pt-br.json
D ExtendedEditBar/i18n/pt.json
D ExtendedEditBar/i18n/qqq.json
D ExtendedEditBar/i18n/roa-tara.json
D ExtendedEditBar/i18n/ru.json
D ExtendedEditBar/i18n/sd.json
D ExtendedEditBar/i18n/sl.json
D ExtendedEditBar/i18n/sv.json
D ExtendedEditBar/i18n/tcy.json
D ExtendedEditBar/i18n/tr.json
D ExtendedEditBar/i18n/tt-cyrl.json
D ExtendedEditBar/i18n/uk.json
D ExtendedEditBar/i18n/yi.json
D ExtendedEditBar/i18n/zh-hans.json
D ExtendedEditBar/i18n/zh-hant.json
D ExtendedEditBar/resources/bluespice.extendedEditBar.css
D ExtendedEditBar/resources/bluespice.extendedEditBar.js
D ExtendedEditBar/resources/images/button_break.png
D ExtendedEditBar/resources/images/button_external-link.png
D ExtendedEditBar/resources/images/button_filelink.png
D ExtendedEditBar/resources/images/button_format-bold.png
D ExtendedEditBar/resources/images/button_format-h2.png
D ExtendedEditBar/resources/images/button_format-italic.png
D ExtendedEditBar/resources/images/button_format-struck.png
D ExtendedEditBar/resources/images/button_gallery.png
D ExtendedEditBar/resources/images/button_hidden-comment.png
D ExtendedEditBar/resources/images/button_internal-link.png
D ExtendedEditBar/resources/images/button_medialink.png
D ExtendedEditBar/resources/images/button_redirect.png
D ExtendedEditBar/resources/images/button_signatur.png
D ExtendedEditBar/resources/images/button_table.png
71 files changed, 0 insertions(+), 1,665 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions
refs/changes/89/386589/1
diff --git a/ExtendedEditBar/ExtendedEditBar.class.php
b/ExtendedEditBar/ExtendedEditBar.class.php
deleted file mode 100644
index bc7cb95..000
--- a/ExtendedEditBar/ExtendedEditBar.class.php
+++ /dev/null
@@ -1,299 +0,0 @@
-http://www.bluespice.com
- *
- * @author Markus Glaser
- * @author MediaWiki Extension
- * @version2.23.1
- * @packageBlueSpice_Extensions
- * @subpackage ExtendedEditBar
- * @copyright Copyright (C) 2016 Hallo Welt! GmbH, All rights reserved.
- * @licensehttp://www.gnu.org/copyleft/gpl.html GNU Public License v2 or
later
- * @filesource
- */
-
-/**
- * Base class for ExtendedEditBar extension
- * @package BlueSpice_Extensions
- * @subpackage ExtendedEditBar
- */
-class ExtendedEditBar extends BsExtensionMW {
- /**
-* Initialization of ExtendedEditBar extension
-*/
- protected function initExt() {
- wfProfileIn( 'BS::'.__METHOD__ );
- $this->setHook('EditPageBeforeEditToolbar');
- wfProfileOut( 'BS::'.__METHOD__ );
- }
-
- /**
-*
-* @global type $wgStylePath
-* @global type $wgContLang
-* @global type $wgLang
-* @global OutputPage $wgOut
-* @global type $wgUseTeX
-* @global type $wgEnableUploads
-* @global type $wgForeignFileRepos
-* @param string $toolbar
-* @return boolean
-*/
- public function onEditPageBeforeEditToolbar( &$toolbar ) {
- // Disable editbar when there is no toolbar and on certain
actions. This
- // is especially needed for compatibility with
Extension:LiquidThreads.
- global $bsgExtendedEditBarEnabledActions;
-
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[master]: Removed extensions from default config
Robert Vogel has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/386590 ) Change subject: Removed extensions from default config .. Removed extensions from default config Removed extensions that now have their own repositories Change-Id: I68104356e298660991f46039092847470618 --- M BlueSpiceExtensions.default.php 1 file changed, 0 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions refs/changes/90/386590/1 diff --git a/BlueSpiceExtensions.default.php b/BlueSpiceExtensions.default.php index 3ad2c08..c6b62ee 100644 --- a/BlueSpiceExtensions.default.php +++ b/BlueSpiceExtensions.default.php @@ -2,10 +2,7 @@ // WikiAdmin Extensions require_once( __DIR__."/WikiAdmin/WikiAdmin.setup.php" ); require_once( __DIR__."/ExtensionInfo/ExtensionInfo.setup.php" ); -require_once( __DIR__."/GroupManager/GroupManager.setup.php" ); require_once( __DIR__."/InterWikiLinks/InterWikiLinks.setup.php" ); -require_once( __DIR__."/NamespaceManager/NamespaceManager.setup.php" ); -require_once( __DIR__."/Preferences/Preferences.setup.php" ); //Other Extensions require_once( __DIR__."/StateBar/StateBar.setup.php" ); @@ -30,15 +27,12 @@ require_once( __DIR__."/PagesVisited/PagesVisited.setup.php" ); require_once( __DIR__."/TopMenuBarCustomizer/TopMenuBarCustomizer.setup.php" ); require_once( __DIR__."/UsageTracker/UsageTracker.setup.php" ); -require_once( __DIR__."/UserPreferences/UserPreferences.setup.php" ); require_once( __DIR__."/UserSidebar/UserSidebar.setup.php" ); require_once( __DIR__."/WatchList/WatchList.setup.php" ); require_once( __DIR__."/WhoIsOnline/WhoIsOnline.setup.php" ); require_once( __DIR__."/ShoutBox/ShoutBox.setup.php" ); require_once( __DIR__."/VisualEditor/VisualEditor.setup.php" ); -require_once( __DIR__."/ExtendedEditBar/ExtendedEditBar.setup.php" ); require_once( __DIR__."/RSSStandards/RSSStandards.setup.php" ); require_once( __DIR__."/SaferEdit/SaferEdit.setup.php" ); -require_once( __DIR__."/Readers/Readers.setup.php" ); #require_once( __DIR__."/UniversalExport/UniversalExport.setup.php" ); #require_once( __DIR__."/UEModulePDF/UEModulePDF.setup.php" ); -- To view, visit https://gerrit.wikimedia.org/r/386590 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I68104356e298660991f46039092847470618 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions Gerrit-Branch: master Gerrit-Owner: Robert Vogel ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[master]: Removed extensions from default config
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/386590 ) Change subject: Removed extensions from default config .. Removed extensions from default config Removed extensions that now have their own repositories Change-Id: I68104356e298660991f46039092847470618 --- M BlueSpiceExtensions.default.php 1 file changed, 0 insertions(+), 6 deletions(-) Approvals: Robert Vogel: Looks good to me, approved jenkins-bot: Verified diff --git a/BlueSpiceExtensions.default.php b/BlueSpiceExtensions.default.php index 3ad2c08..c6b62ee 100644 --- a/BlueSpiceExtensions.default.php +++ b/BlueSpiceExtensions.default.php @@ -2,10 +2,7 @@ // WikiAdmin Extensions require_once( __DIR__."/WikiAdmin/WikiAdmin.setup.php" ); require_once( __DIR__."/ExtensionInfo/ExtensionInfo.setup.php" ); -require_once( __DIR__."/GroupManager/GroupManager.setup.php" ); require_once( __DIR__."/InterWikiLinks/InterWikiLinks.setup.php" ); -require_once( __DIR__."/NamespaceManager/NamespaceManager.setup.php" ); -require_once( __DIR__."/Preferences/Preferences.setup.php" ); //Other Extensions require_once( __DIR__."/StateBar/StateBar.setup.php" ); @@ -30,15 +27,12 @@ require_once( __DIR__."/PagesVisited/PagesVisited.setup.php" ); require_once( __DIR__."/TopMenuBarCustomizer/TopMenuBarCustomizer.setup.php" ); require_once( __DIR__."/UsageTracker/UsageTracker.setup.php" ); -require_once( __DIR__."/UserPreferences/UserPreferences.setup.php" ); require_once( __DIR__."/UserSidebar/UserSidebar.setup.php" ); require_once( __DIR__."/WatchList/WatchList.setup.php" ); require_once( __DIR__."/WhoIsOnline/WhoIsOnline.setup.php" ); require_once( __DIR__."/ShoutBox/ShoutBox.setup.php" ); require_once( __DIR__."/VisualEditor/VisualEditor.setup.php" ); -require_once( __DIR__."/ExtendedEditBar/ExtendedEditBar.setup.php" ); require_once( __DIR__."/RSSStandards/RSSStandards.setup.php" ); require_once( __DIR__."/SaferEdit/SaferEdit.setup.php" ); -require_once( __DIR__."/Readers/Readers.setup.php" ); #require_once( __DIR__."/UniversalExport/UniversalExport.setup.php" ); #require_once( __DIR__."/UEModulePDF/UEModulePDF.setup.php" ); -- To view, visit https://gerrit.wikimedia.org/r/386590 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I68104356e298660991f46039092847470618 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions Gerrit-Branch: master Gerrit-Owner: Robert Vogel Gerrit-Reviewer: Robert Vogel 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...BlueSpiceExtensions[master]: Remove UserPreferences and Readers from BlueSpiceExtensions
Robert Vogel has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/384974 )
Change subject: Remove UserPreferences and Readers from BlueSpiceExtensions
..
Remove UserPreferences and Readers from BlueSpiceExtensions
Change-Id: I553b13e51ab682e1a3acce20a506b2644fbd602c
ERM: #7770, #7771
---
D Readers/Readers.class.php
D Readers/Readers.setup.php
D Readers/db/readers.patch.readers_ts.sql
D Readers/db/readers.sql
D Readers/extension.json
D Readers/i18n/arq.json
D Readers/i18n/atj.json
D Readers/i18n/ba.json
D Readers/i18n/bg.json
D Readers/i18n/bgn.json
D Readers/i18n/br.json
D Readers/i18n/ca.json
D Readers/i18n/ce.json
D Readers/i18n/csb.json
D Readers/i18n/de-formal.json
D Readers/i18n/de.json
D Readers/i18n/diq.json
D Readers/i18n/en.json
D Readers/i18n/eo.json
D Readers/i18n/es.json
D Readers/i18n/et.json
D Readers/i18n/eu.json
D Readers/i18n/fa.json
D Readers/i18n/fr.json
D Readers/i18n/fy.json
D Readers/i18n/gl.json
D Readers/i18n/gom-deva.json
D Readers/i18n/gom-latn.json
D Readers/i18n/he.json
D Readers/i18n/it.json
D Readers/i18n/ja.json
D Readers/i18n/kn.json
D Readers/i18n/ko.json
D Readers/i18n/ksh.json
D Readers/i18n/ku-latn.json
D Readers/i18n/lb.json
D Readers/i18n/lrc.json
D Readers/i18n/lt.json
D Readers/i18n/lv.json
D Readers/i18n/lzh.json
D Readers/i18n/mk.json
D Readers/i18n/my.json
D Readers/i18n/nah.json
D Readers/i18n/nb.json
D Readers/i18n/nl.json
D Readers/i18n/olo.json
D Readers/i18n/om.json
D Readers/i18n/pl.json
D Readers/i18n/ps.json
D Readers/i18n/pt-br.json
D Readers/i18n/pt.json
D Readers/i18n/qqq.json
D Readers/i18n/qu.json
D Readers/i18n/ru.json
D Readers/i18n/sd.json
D Readers/i18n/sl.json
D Readers/i18n/sv.json
D Readers/i18n/ta.json
D Readers/i18n/tcy.json
D Readers/i18n/tg-cyrl.json
D Readers/i18n/tr.json
D Readers/i18n/tt-cyrl.json
D Readers/i18n/uk.json
D Readers/i18n/zh-hans.json
D Readers/i18n/zh-hant.json
D Readers/includes/api/BSApiReadersDataStore.php
D Readers/includes/api/BSApiReadersUsersStore.php
D Readers/includes/specials/SpecialReaders.class.php
D Readers/languages/SpecialReaders.alias.php
D Readers/resources/BS.Readers/Panel.js
D Readers/resources/BS.Readers/PathPanel.js
D Readers/resources/bluespice.readers.css
D Readers/resources/bluespice.readers.js
D Readers/resources/bluespice.readerspath.js
D Readers/tests/phpunit/BSApiReadersDataStoreTest.php
D Readers/tests/phpunit/BSApiReadersUsersStoreTest.php
D Readers/tests/phpunit/BSReadersFixtures.php
D Readers/tests/phpunit/data/bs_readers.fixtures.json
D Readers/views/view.Readers.php
D UserPreferences/UserPreferences.class.php
D UserPreferences/UserPreferences.setup.php
D UserPreferences/extension.json
D UserPreferences/i18n/ast.json
D UserPreferences/i18n/ba.json
D UserPreferences/i18n/be-tarask.json
D UserPreferences/i18n/br.json
D UserPreferences/i18n/cnh.json
D UserPreferences/i18n/de.json
D UserPreferences/i18n/en.json
D UserPreferences/i18n/es.json
D UserPreferences/i18n/eu.json
D UserPreferences/i18n/fr.json
D UserPreferences/i18n/gl.json
D UserPreferences/i18n/it.json
D UserPreferences/i18n/ja.json
D UserPreferences/i18n/kab.json
D UserPreferences/i18n/ko.json
D UserPreferences/i18n/ksh.json
D UserPreferences/i18n/lb.json
D UserPreferences/i18n/lij.json
D UserPreferences/i18n/mg.json
D UserPreferences/i18n/mk.json
D UserPreferences/i18n/nb.json
D UserPreferences/i18n/ne.json
D UserPreferences/i18n/nl.json
D UserPreferences/i18n/oc.json
D UserPreferences/i18n/pt-br.json
D UserPreferences/i18n/pt.json
D UserPreferences/i18n/qqq.json
D UserPreferences/i18n/roa-tara.json
D UserPreferences/i18n/ru.json
D UserPreferences/i18n/sl.json
D UserPreferences/i18n/sv.json
D UserPreferences/i18n/tt-cyrl.json
D UserPreferences/i18n/uk.json
D UserPreferences/i18n/zh-hans.json
D UserPreferences/i18n/zh-hant.json
D UserPreferences/resources/bluespice.userpreferences.css
118 files changed, 0 insertions(+), 2,580 deletions(-)
Approvals:
Robert Vogel: Verified; Looks good to me, approved
diff --git a/Readers/Readers.class.php b/Readers/Readers.class.php
deleted file mode 100644
index 3963f82..000
--- a/Readers/Readers.class.php
+++ /dev/null
@@ -1,265 +0,0 @@
-http://www.bluespice.com
- *
- * @author Stephan Muggli
- * @version2.23.1
- * @packageBlueSpice_Extensions
- * @subpackage Readers
- * @copyright Copyright (C) 2016 Hallo Welt! GmbH, All rights reserved.
- * @licensehttp://www.gnu.org/copyleft/gpl.html GNU Public License v2 or
later
- * @filesource
- */
-
-/**
- * Readers extension
- * @package BlueSpice_Extensions
- * @subpackage Readers
- */
-class Readers extends BsExtensionMW {
- /**
-* Initialization of ExtensionTemplate extension
-*/
- public function initExt() {
- wfProfileIn( 'BS::'.__METHOD__ );
-
- $this->setHook( 'BeforePageDisplay' );
- $this->setHook( 'SkinTemplateOutputPageBeforeExec' );
- $th
[MediaWiki-commits] [Gerrit] operations/puppet[production]: profile::mariadb::misc::eventlogging::database: set correct ...
Elukey has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/386586 )
Change subject: profile::mariadb::misc::eventlogging::database: set correct
mysql params
..
profile::mariadb::misc::eventlogging::database: set correct mysql params
Bug: T177405
Change-Id: I22e316217bcfbd63450b1a4aad978c4fa3c14db9
---
M modules/profile/manifests/mariadb/misc/eventlogging/database.pp
M modules/profile/templates/mariadb/misc/eventlogging/eventlogging.my.cnf.erb
2 files changed, 10 insertions(+), 4 deletions(-)
Approvals:
Marostegui: Looks good to me, but someone else must approve
Elukey: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/profile/manifests/mariadb/misc/eventlogging/database.pp
b/modules/profile/manifests/mariadb/misc/eventlogging/database.pp
index 89fa337..27eacde 100644
--- a/modules/profile/manifests/mariadb/misc/eventlogging/database.pp
+++ b/modules/profile/manifests/mariadb/misc/eventlogging/database.pp
@@ -39,8 +39,10 @@
if os_version('debian >= stretch') {
$mariadb_basedir = '/opt/wmf-mariadb101'
+$mariadb_socket = '/run/mysqld/mysqld.sock'
} else {
$mariadb_basedir = '/opt/wmf-mariadb10'
+$mariadb_socket = '/tmp/mysql.sock'
}
# History context: there used to be a distinction between
@@ -54,6 +56,8 @@
config=>
'profile/mariadb/misc/eventlogging/eventlogging.my.cnf.erb',
datadir => '/srv/sqldata',
tmpdir=> '/srv/tmp',
+socket=> $mariadb_socket,
+port => 3306,
read_only => 0,
ssl => 'puppet-cert',
p_s => 'off',
diff --git
a/modules/profile/templates/mariadb/misc/eventlogging/eventlogging.my.cnf.erb
b/modules/profile/templates/mariadb/misc/eventlogging/eventlogging.my.cnf.erb
index 8b82f98..4e6a47c 100644
---
a/modules/profile/templates/mariadb/misc/eventlogging/eventlogging.my.cnf.erb
+++
b/modules/profile/templates/mariadb/misc/eventlogging/eventlogging.my.cnf.erb
@@ -1,8 +1,10 @@
+ THIS FILE IS MANAGED BY PUPPET
+
# Eventlogging (m4)
[client]
-port = 3306
-socket = /tmp/mysql.sock
+port = <%= @port %>
+socket = <%= @socket %>
<% if @ssl == 'on' %>
# ssl
ssl-ca=/etc/mysql/ssl/cacert.pem
@@ -22,8 +24,8 @@
[mysqld]
user = mysql
-socket = /tmp/mysql.sock
-port = 3306
+socket = <%= @socket %>
+port = <%= @port %>
extra_port = 3307
basedir= <%= @basedir %>
datadir= <%= @datadir %>
--
To view, visit https://gerrit.wikimedia.org/r/386586
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I22e316217bcfbd63450b1a4aad978c4fa3c14db9
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Elukey
Gerrit-Reviewer: Elukey
Gerrit-Reviewer: Marostegui
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: mediawiki: Disable rebuildTermSqlIndex
Marostegui has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/386588 )
Change subject: mediawiki: Disable rebuildTermSqlIndex
..
mediawiki: Disable rebuildTermSqlIndex
It's done now \o/
Bug: T163551
Change-Id: Ie0efd36df08981aadf63d26bfc6d91cb71766e7c
---
M modules/mediawiki/manifests/maintenance/wikidata.pp
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Marostegui: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/mediawiki/manifests/maintenance/wikidata.pp
b/modules/mediawiki/manifests/maintenance/wikidata.pp
index df409ec..526fd35 100644
--- a/modules/mediawiki/manifests/maintenance/wikidata.pp
+++ b/modules/mediawiki/manifests/maintenance/wikidata.pp
@@ -56,7 +56,7 @@
# rebuildTermSqlIndex is temporarilly stopped
cron { 'wikibase-rebuildTermSqlIndex':
-ensure => $ensure,
+ensure => absent,
command => '/usr/bin/timeout 3500s /usr/local/bin/mwscript
extensions/Wikidata/extensions/Wikibase/repo/maintenance/rebuildTermSqlIndex.php
--wiki wikidatawiki --entity-type=item --deduplicate-terms --batch-size 500
--sleep 10 --from-id $(/bin/ls -t /var/log/wikidata/rebuildTermSqlIndex.log
/var/log/wikidata/rebuildTermSqlIndex.log*[0-9] | /usr/bin/xargs -d "\n"
/usr/bin/tac 2> /dev/null | /usr/bin/awk \'/Processed up to page (\d+?)/ {
print $5 }\' | head -n1) >> /var/log/wikidata/rebuildTermSqlIndex.log 2>&1',
user=> $::mediawiki::users::web,
minute => 30,
--
To view, visit https://gerrit.wikimedia.org/r/386588
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie0efd36df08981aadf63d26bfc6d91cb71766e7c
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ladsgroup
Gerrit-Reviewer: Alex Monk
Gerrit-Reviewer: Giuseppe Lavagetto
Gerrit-Reviewer: Marostegui
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Log Wikidata dispatchers on terbium
Hoo man has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/386591 )
Change subject: Log Wikidata dispatchers on terbium
..
Log Wikidata dispatchers on terbium
Given we had problems with this several times in the past, let's
log their output and exit code (at least for now).
Bug: T178624
Change-Id: I0a6318b610708f39b36affb1249754b5796d0418
---
M modules/mediawiki/manifests/maintenance/wikidata.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/91/386591/1
diff --git a/modules/mediawiki/manifests/maintenance/wikidata.pp
b/modules/mediawiki/manifests/maintenance/wikidata.pp
index df409ec..9344bac 100644
--- a/modules/mediawiki/manifests/maintenance/wikidata.pp
+++ b/modules/mediawiki/manifests/maintenance/wikidata.pp
@@ -6,7 +6,7 @@
# This handles inserting jobs into client job queue, which then process
the changes
cron { 'wikibase-dispatch-changes4':
ensure => $ensure,
-command => '/usr/local/bin/mwscript
extensions/Wikidata/extensions/Wikibase/repo/maintenance/dispatchChanges.php
--wiki wikidatawiki --max-time 540 --batch-size 420 --dispatch-interval 25
--lock-grace-interval 200 >/dev/null 2>&1',
+command => 'echo "$$: Starting dispatcher" >>
/var/log/wikidata/dispatchChanges-wikidatawiki.log; /usr/local/bin/mwscript
extensions/Wikidata/extensions/Wikibase/repo/maintenance/dispatchChanges.php
--wiki wikidatawiki --max-time 540 --batch-size 420 --dispatch-interval 25
--lock-grace-interval 200 >> /var/log/wikidata/dispatchChanges-wikidatawiki.log
2>&1; echo "$$: Dispatcher exited with $?" >>
/var/log/wikidata/dispatchChanges-wikidatawiki.log',
user=> $::mediawiki::users::web,
minute => '*/3',
}
--
To view, visit https://gerrit.wikimedia.org/r/386591
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0a6318b610708f39b36affb1249754b5796d0418
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hoo man
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[master]: Removed extensions from default config #2
Robert Vogel has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/386592 ) Change subject: Removed extensions from default config #2 .. Removed extensions from default config #2 Removed extensions that now have their own repositories Change-Id: I7c13edb76448c962ac0ce3ea8bd4e07d948ed7d5 --- M BlueSpiceExtensions.default.php 1 file changed, 0 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions refs/changes/92/386592/1 diff --git a/BlueSpiceExtensions.default.php b/BlueSpiceExtensions.default.php index c6b62ee..dd69508 100644 --- a/BlueSpiceExtensions.default.php +++ b/BlueSpiceExtensions.default.php @@ -8,10 +8,6 @@ require_once( __DIR__."/StateBar/StateBar.setup.php" ); require_once( __DIR__."/RSSFeeder/RSSFeeder.setup.php" ); require_once( __DIR__."/AboutBlueSpice/AboutBlueSpice.setup.php" ); -require_once( __DIR__."/Blog/Blog.setup.php" ); -require_once( __DIR__."/Checklist/Checklist.setup.php" ); -require_once( __DIR__."/ContextMenu/ContextMenu.setup.php" ); -require_once( __DIR__."/CountThings/CountThings.setup.php" ); require_once( __DIR__."/CSyntaxHighlight/CSyntaxHighlight.setup.php" ); require_once( __DIR__."/Dashboards/Dashboards.setup.php" ); require_once( __DIR__."/Emoticons/Emoticons.setup.php" ); -- To view, visit https://gerrit.wikimedia.org/r/386592 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7c13edb76448c962ac0ce3ea8bd4e07d948ed7d5 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions Gerrit-Branch: master Gerrit-Owner: Robert Vogel ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Create /run/nutcracker on stretch onwards
Muehlenhoff has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/384980 )
Change subject: Create /run/nutcracker on stretch onwards
..
Create /run/nutcracker on stretch onwards
In jessie we used a custom nutcracker package which shipped a tmpfiles.d
config to create /run/nutcracker. Starting with stretch we're using the
unmodified Debian package, so ship the tmpfiles.d configuration via
systemd::tmpfile.
Bug: T178457
Change-Id: Id2b445d9bda403759caf329106eb56d9accfc2b5
---
M modules/profile/manifests/mediawiki/nutcracker.pp
1 file changed, 9 insertions(+), 0 deletions(-)
Approvals:
Muehlenhoff: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/profile/manifests/mediawiki/nutcracker.pp
b/modules/profile/manifests/mediawiki/nutcracker.pp
index 91da301..1f885a3 100644
--- a/modules/profile/manifests/mediawiki/nutcracker.pp
+++ b/modules/profile/manifests/mediawiki/nutcracker.pp
@@ -75,6 +75,15 @@
$nutcracker_pools = merge($pools, $additional_pools)
+# In jessie we used a custom nutcracker package which shipped a tmpfiles.d
+# config to create /run/nutcracker. Starting with stretch we're using the
+# unmodified Debian package, so ship the tmpfiles.d configuration via
systemd::tmpfile
+if os_version('debian >= stretch') {
+systemd::tmpfile { 'nutcracker':
+content => 'd /run/nutcracker 0755 nutcracker nutcracker - -'
+}
+}
+
class { '::nutcracker':
mbuf_size => '64k',
pools => $nutcracker_pools,
--
To view, visit https://gerrit.wikimedia.org/r/384980
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id2b445d9bda403759caf329106eb56d9accfc2b5
Gerrit-PatchSet: 9
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff
Gerrit-Reviewer: Elukey
Gerrit-Reviewer: Faidon Liambotis
Gerrit-Reviewer: Giuseppe Lavagetto
Gerrit-Reviewer: Hashar
Gerrit-Reviewer: Muehlenhoff
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]: Update to Celery 4
Ladsgroup has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/386458 ) Change subject: Update to Celery 4 .. Update to Celery 4 Bug: T178441 Change-Id: Ia7f673fcc1042cda45b9f22c08ef5219448d3663 --- M requirements.txt M submodules/wheels 2 files changed, 3 insertions(+), 3 deletions(-) Approvals: Ladsgroup: Verified; Looks good to me, approved diff --git a/requirements.txt b/requirements.txt index d163041..242acc0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ -celery >= 3.1.22, < 3.1.999 +celery >= 4.1.0, < 4.1.999 editquality >= 0.4.1, < 0.4.999 -ores >= 0.7.3, < 0.7.999 +ores >= 1.0.0, < 1.0.999 redis >= 2.10.5, < 2.10.999 revscoring >= 2.0.6, < 1.3.999 statsd >= 3.2.1, < 3.2.999 diff --git a/submodules/wheels b/submodules/wheels index 50d4d2d..fa10d20 16 --- a/submodules/wheels +++ b/submodules/wheels @@ -1 +1 @@ -Subproject commit 50d4d2db2ca442254f33502b1fbbcebe9d8679dc +Subproject commit fa10d2033e7fdeef91212dae01074bf86868f6e1 -- To view, visit https://gerrit.wikimedia.org/r/386458 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia7f673fcc1042cda45b9f22c08ef5219448d3663 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/ores/deploy Gerrit-Branch: master Gerrit-Owner: Awight Gerrit-Reviewer: Halfak Gerrit-Reviewer: Ladsgroup ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Correct wheels submodule location
Ladsgroup has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/386457 ) Change subject: Correct wheels submodule location .. Correct wheels submodule location Change-Id: Idd1c74219edcd70837e2a459db8f1e9f1b8c9088 --- M .gitmodules 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Ladsgroup: Verified; Looks good to me, approved diff --git a/.gitmodules b/.gitmodules index b7a5da5..119b7ba 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "submodules/wheels"] path = submodules/wheels - url = https://phabricator.wikimedia.org/source/wheels.git + url = https://phabricator.wikimedia.org/source/ores-deploy-wheels.git [submodule "submodules/ores"] path = submodules/ores url = https://phabricator.wikimedia.org/source/ores.git -- To view, visit https://gerrit.wikimedia.org/r/386457 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Idd1c74219edcd70837e2a459db8f1e9f1b8c9088 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/ores/deploy Gerrit-Branch: master Gerrit-Owner: Awight Gerrit-Reviewer: Halfak Gerrit-Reviewer: Ladsgroup ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: cache: move frontend memory cache sizing to varnish::common
Ema has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/386593 )
Change subject: cache: move frontend memory cache sizing to varnish::common
..
cache: move frontend memory cache sizing to varnish::common
Change-Id: Ide1244ae94a1f7e58d039d93b493fc6d8032f03b
---
M modules/cacheproxy/manifests/instance_pair.pp
M modules/varnish/manifests/common.pp
2 files changed, 14 insertions(+), 13 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/93/386593/1
diff --git a/modules/cacheproxy/manifests/instance_pair.pp
b/modules/cacheproxy/manifests/instance_pair.pp
index e60f88f..ab42422 100644
--- a/modules/cacheproxy/manifests/instance_pair.pp
+++ b/modules/cacheproxy/manifests/instance_pair.pp
@@ -51,18 +51,6 @@
$our_backend_caches = hash_deselect_re("^cache_${::site}",
$becaches_filtered)
-# Frontend memory cache sizing
-$mem_gb = $::memorysize_mb / 1024.0
-if ($mem_gb < 90.0) {
-# virtuals, test hosts, etc...
-$fe_mem_gb = 1
-} else {
-# Removing a constant factor before scaling helps with
-# low-memory hosts, as they need more relative space to
-# handle all the non-cache basics.
-$fe_mem_gb = ceiling(0.7 * ($mem_gb - 80.0))
-}
-
# Transient storage limits T164768
if $fe_transient_gb > 0 {
@@ -118,7 +106,7 @@
extra_vcl => $fe_extra_vcl,
ports => [ '80', '3120', '3121', '3122', '3123', '3124',
'3125', '3126', '3127' ],
admin_port => 6082,
-storage=> "-s malloc,${fe_mem_gb}G
${fe_transient_storage}",
+storage=> "-s malloc,${::varnish::common::fe_mem_gb}G
${fe_transient_storage}",
jemalloc_conf => $fe_jemalloc_conf,
backend_caches => {
'cache_local' => {
diff --git a/modules/varnish/manifests/common.pp
b/modules/varnish/manifests/common.pp
index 3603e09..f88237c 100644
--- a/modules/varnish/manifests/common.pp
+++ b/modules/varnish/manifests/common.pp
@@ -1,6 +1,19 @@
class varnish::common($varnish_version=4, $fe_runtime_params=[],
$be_runtime_params=[]) {
require ::varnish::packages
+# Frontend memory cache sizing
+$mem_gb = $::memorysize_mb / 1024.0
+
+if ($mem_gb < 90.0) {
+# virtuals, test hosts, etc...
+$fe_mem_gb = 1
+} else {
+# Removing a constant factor before scaling helps with
+# low-memory hosts, as they need more relative space to
+# handle all the non-cache basics.
+$fe_mem_gb = ceiling(0.7 * ($mem_gb - 80.0))
+}
+
# Mount /var/lib/varnish as tmpfs to avoid Linux flushing mlocked
# shm memory to disk
mount { '/var/lib/varnish':
--
To view, visit https://gerrit.wikimedia.org/r/386593
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ide1244ae94a1f7e58d039d93b493fc6d8032f03b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ema
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Add property for RDF mapping of external identifiers for Wik...
Ladsgroup has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/386594 )
Change subject: Add property for RDF mapping of external identifiers for
Wikidata
..
Add property for RDF mapping of external identifiers for Wikidata
Bug: T178180
Change-Id: I5991f3f5d27acc63c4a08fe1ed91bd2f1ab0b1d9
---
M wmf-config/Wikibase.php
1 file changed, 3 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/94/386594/1
diff --git a/wmf-config/Wikibase.php b/wmf-config/Wikibase.php
index 1478ee7..a32de27 100644
--- a/wmf-config/Wikibase.php
+++ b/wmf-config/Wikibase.php
@@ -143,6 +143,9 @@
$wgWBRepoSettings['dispatchingLockManager'] = 'redisLockManager';
// Cirrus usage for wbsearchentities is on
$wgWBRepoSettings['entitySearch']['useCirrus'] = true;
+
+ // T178180
+ $wgWBRepoSettings['canonicalUriProperty'] = 'P1921';
}
if ( $wmgUseWikibaseClient ) {
--
To view, visit https://gerrit.wikimedia.org/r/386594
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5991f3f5d27acc63c4a08fe1ed91bd2f1ab0b1d9
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Ladsgroup
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: cache: move frontend memory cache sizing to varnish::common
Ema has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/386593 )
Change subject: cache: move frontend memory cache sizing to varnish::common
..
cache: move frontend memory cache sizing to varnish::common
Change-Id: Ide1244ae94a1f7e58d039d93b493fc6d8032f03b
---
M modules/cacheproxy/manifests/instance_pair.pp
M modules/varnish/manifests/common.pp
2 files changed, 14 insertions(+), 13 deletions(-)
Approvals:
Ema: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/cacheproxy/manifests/instance_pair.pp
b/modules/cacheproxy/manifests/instance_pair.pp
index e60f88f..ab42422 100644
--- a/modules/cacheproxy/manifests/instance_pair.pp
+++ b/modules/cacheproxy/manifests/instance_pair.pp
@@ -51,18 +51,6 @@
$our_backend_caches = hash_deselect_re("^cache_${::site}",
$becaches_filtered)
-# Frontend memory cache sizing
-$mem_gb = $::memorysize_mb / 1024.0
-if ($mem_gb < 90.0) {
-# virtuals, test hosts, etc...
-$fe_mem_gb = 1
-} else {
-# Removing a constant factor before scaling helps with
-# low-memory hosts, as they need more relative space to
-# handle all the non-cache basics.
-$fe_mem_gb = ceiling(0.7 * ($mem_gb - 80.0))
-}
-
# Transient storage limits T164768
if $fe_transient_gb > 0 {
@@ -118,7 +106,7 @@
extra_vcl => $fe_extra_vcl,
ports => [ '80', '3120', '3121', '3122', '3123', '3124',
'3125', '3126', '3127' ],
admin_port => 6082,
-storage=> "-s malloc,${fe_mem_gb}G
${fe_transient_storage}",
+storage=> "-s malloc,${::varnish::common::fe_mem_gb}G
${fe_transient_storage}",
jemalloc_conf => $fe_jemalloc_conf,
backend_caches => {
'cache_local' => {
diff --git a/modules/varnish/manifests/common.pp
b/modules/varnish/manifests/common.pp
index 3603e09..f88237c 100644
--- a/modules/varnish/manifests/common.pp
+++ b/modules/varnish/manifests/common.pp
@@ -1,6 +1,19 @@
class varnish::common($varnish_version=4, $fe_runtime_params=[],
$be_runtime_params=[]) {
require ::varnish::packages
+# Frontend memory cache sizing
+$mem_gb = $::memorysize_mb / 1024.0
+
+if ($mem_gb < 90.0) {
+# virtuals, test hosts, etc...
+$fe_mem_gb = 1
+} else {
+# Removing a constant factor before scaling helps with
+# low-memory hosts, as they need more relative space to
+# handle all the non-cache basics.
+$fe_mem_gb = ceiling(0.7 * ($mem_gb - 80.0))
+}
+
# Mount /var/lib/varnish as tmpfs to avoid Linux flushing mlocked
# shm memory to disk
mount { '/var/lib/varnish':
--
To view, visit https://gerrit.wikimedia.org/r/386593
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ide1244ae94a1f7e58d039d93b493fc6d8032f03b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ema
Gerrit-Reviewer: BBlack
Gerrit-Reviewer: Ema
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...Wikibase[master]: Fix typo
Ladsgroup has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/386595 ) Change subject: Fix typo .. Fix typo Change-Id: Ibe30b7b916ea48b59e72f8ba2827845bc699194f --- M repo/includes/Search/Elastic/EntitySearchElastic.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/95/386595/1 diff --git a/repo/includes/Search/Elastic/EntitySearchElastic.php b/repo/includes/Search/Elastic/EntitySearchElastic.php index 9dd9755..7452a2f 100644 --- a/repo/includes/Search/Elastic/EntitySearchElastic.php +++ b/repo/includes/Search/Elastic/EntitySearchElastic.php @@ -191,7 +191,7 @@ $labelsQuery->addFilter( $labelsFilter ); $labelsQuery->addMust( $dismax ); // TODO: this is a bit hacky, better way would be to make the field case-insensitive - // or add new subfiled which is case-insensitive + // or add new subfield which is case-insensitive $titleMatch = new Term( [ 'title.keyword' => strtoupper( $text ) ] ); // Match either labels or exact match to title -- To view, visit https://gerrit.wikimedia.org/r/386595 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibe30b7b916ea48b59e72f8ba2827845bc699194f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Ladsgroup ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Wikidata[master]: New Wikidata Build - 2017-10-26T10:00:01+0000
WikidataBuilder has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/386596 )
Change subject: New Wikidata Build - 2017-10-26T10:00:01+
..
New Wikidata Build - 2017-10-26T10:00:01+
Change-Id: I74c3f354260d86624f2120f3d1ae8ed3dca67989
---
M composer.lock
M extensions/Constraints/i18n/he.json
M extensions/Wikibase/client/i18n/tg-cyrl.json
M extensions/Wikibase/docs/options.wiki
M extensions/Wikibase/repo/Wikibase.hooks.php
M extensions/Wikibase/repo/Wikibase.php
M extensions/Wikibase/repo/config/ElasticSearchRescoreFunctions.php
M extensions/Wikibase/repo/config/ElasticSearchRescoreProfiles.php
M extensions/Wikibase/repo/config/Wikibase.default.php
M extensions/Wikibase/repo/i18n/ja.json
M extensions/Wikibase/repo/i18n/tr.json
M extensions/Wikibase/repo/includes/Search/Elastic/ElasticTermResult.php
M extensions/Wikibase/repo/includes/Search/Elastic/EntitySearchElastic.php
A
extensions/Wikibase/repo/includes/Search/Elastic/StatementBoostScoreBuilder.php
M extensions/Wikibase/repo/includes/Search/Elastic/WikibasePrefixSearcher.php
M extensions/Wikibase/repo/includes/WikibaseRepo.php
M
extensions/Wikibase/repo/tests/phpunit/data/entitySearch/search_de-ch-en.expected
M extensions/Wikibase/repo/tests/phpunit/data/entitySearch/search_de-ch.expected
M
extensions/Wikibase/repo/tests/phpunit/data/entitySearch/search_de-ch_strict.expected
M extensions/Wikibase/repo/tests/phpunit/data/entitySearch/search_en.expected
M
extensions/Wikibase/repo/tests/phpunit/data/entitySearch/search_en_strict.expected
A extensions/Wikibase/repo/tests/phpunit/data/entitySearch/search_id.expected
A extensions/Wikibase/repo/tests/phpunit/data/entitySearch/search_id.query
M
extensions/Wikibase/repo/tests/phpunit/includes/Search/Elastic/ElasticTermResultTest.php
A
extensions/Wikibase/repo/tests/phpunit/includes/Search/Elastic/StatementBoostScoreBuilderTest.php
A extensions/Wikidata.org/i18n/tr.json
M vendor/composer/autoload_classmap.php
M vendor/composer/autoload_static.php
M vendor/composer/installed.json
D vendor/data-values/serialization/.gitignore
D vendor/data-values/serialization/.scrutinizer.yml
D vendor/data-values/serialization/.travis.yml
M vendor/data-values/serialization/README.md
D vendor/data-values/serialization/composer.json
D vendor/data-values/serialization/phpcs.xml
D vendor/data-values/serialization/phpunit.xml.dist
M vendor/data-values/serialization/src/Deserializers/DataValueDeserializer.php
D
vendor/data-values/serialization/tests/Deserializers/DataValueDeserializerTest.php
D vendor/data-values/serialization/tests/Serializers/DataValueSerializerTest.php
D vendor/data-values/serialization/tests/bootstrap.php
40 files changed, 468 insertions(+), 552 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata
refs/changes/96/386596/1
diff --git a/composer.lock b/composer.lock
index 84117d4..c03e2d9 100644
--- a/composer.lock
+++ b/composer.lock
@@ -534,26 +534,26 @@
},
{
"name": "data-values/serialization",
-"version": "1.2.1",
+"version": "1.2.2",
"source": {
"type": "git",
"url": "https://github.com/DataValues/Serialization.git";,
-"reference": "2e81e60e413f1578fbaddb9dd2fbcc8236825806"
+"reference": "d849fc1a2f00f22027d504c4e70fd00a0c6a7579"
},
"dist": {
"type": "zip",
-"url":
"https://api.github.com/repos/DataValues/Serialization/zipball/2e81e60e413f1578fbaddb9dd2fbcc8236825806";,
-"reference": "2e81e60e413f1578fbaddb9dd2fbcc8236825806",
+"url":
"https://api.github.com/repos/DataValues/Serialization/zipball/d849fc1a2f00f22027d504c4e70fd00a0c6a7579";,
+"reference": "d849fc1a2f00f22027d504c4e70fd00a0c6a7579",
"shasum": ""
},
"require": {
"data-values/data-values": "~1.0|~0.1",
"php": ">=5.5.9",
-"serialization/serialization": "~3.0"
+"serialization/serialization": "~4.0|~3.0"
},
"require-dev": {
-"mediawiki/mediawiki-codesniffer": ">=0.4 <0.8",
-"phpunit/phpunit": "~4.8"
+"phpunit/phpunit": "~4.8",
+"wikibase/wikibase-codesniffer": "^0.2.0"
},
"type": "library",
"extra": {
@@ -588,7 +588,7 @@
"serializers",
"wikidata"
],
-"time": "2017-06-26 07:24:35"
+"time": "2017-10-25 13:47:05"
},
{
"name": "data-values/time",
@@ -918,7 +918,7 @@
"source": {
"type": "git",
"url":
"https://gerrit.wikimedia.org/r/mediawiki/extensions/Wikidata.org";,
-"reference": "76
[MediaWiki-commits] [Gerrit] mediawiki...Wikispeech[master]: Validate value of API parameter "removetags"
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/376493 )
Change subject: Validate value of API parameter "removetags"
..
Validate value of API parameter "removetags"
Checks if the parameter is a valid JSON string and if the parsed
variable is of the correct format.
Bug: T172523
Change-Id: Ib1093eabd4e03fdbe4df272f70e268a93c9fff36
---
M i18n/en.json
M i18n/qqq.json
M includes/ApiWikispeech.php
M tests/phpunit/ApiWikispeechTest.php
4 files changed, 171 insertions(+), 7 deletions(-)
Approvals:
Lokal Profil: Looks good to me, approved
jenkins-bot: Verified
diff --git a/i18n/en.json b/i18n/en.json
index fb98d2b..0e32437 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -14,8 +14,10 @@
"apihelp-wikispeech-paramvalue-output-originalcontent": "The original
HTML of the page. Intended as help when debugging.",
"apihelp-wikispeech-paramvalue-output-cleanedtext": "The page content
with HTML tags removed.",
"apihelp-wikispeech-paramvalue-output-segments": "The page content
segmented into sentences.",
- "apihelp-wikispeech-param-removetags": "The tags that should be removed
completely during cleaning, as a JSON object of the format:\n{\n
\"tagName1\": true,\n \"tagName2\": \"cssClass\"\n}\nwhere
tagName1 is always removed and tagName2 is only
removed if it also has the CSS class cssClass.",
+ "apihelp-wikispeech-param-removetags": "The tags that should be removed
completely during cleaning, as a JSON object of the format:\n{\n
\"tagName1\": true,\n \"tagName2\": \"cssClass\",\n \"tagName3\":
[\"cssClass1\", \"cssClass2\"]\n}\nwhere tagName1 is always
removed, tagName2 is only removed if it also has the CSS class
cssClass and tagName3 is only removed if it also has
the CSS class cssClass2 or cssClass1.",
"apihelp-wikispeech-param-segmentbreakingtags": "The tag names for tags
that should add segment breaks.",
"apihelp-wikispeech-example-1": "Get segments for the Wikispeech
extension. The tag sup is removed and so is div when
it has the class toc. The tags h1 and h2
break segments.",
- "apihelp-wikispeech-example-2": "Get original HTML content and cleaned
text."
+ "apihelp-wikispeech-example-2": "Get original HTML content and cleaned
text.",
+ "apierror-wikispeech-removetagsinvalidjson": "removetags is
not a valid JSON string.",
+ "apierror-wikispeech-removetagsinvalid": "removetags is not
of a valid format. It must be an object with the values being booleans, strings
or arrays of strings. To not remove any tags, set removetags to
empty object, {}."
}
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 17b1b58..80a60a9 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -17,5 +17,7 @@
"apihelp-wikispeech-param-removetags":
"{{doc-apihelp-param|wikispeech|removetags}}",
"apihelp-wikispeech-param-segmentbreakingtags":
"{{doc-apihelp-param|wikispeech|segmentbreakingtags}}",
"apihelp-wikispeech-example-1": "{{doc-apihelp-example|wikispeech}}",
- "apihelp-wikispeech-example-2": "{{doc-apihelp-example|wikispeech}}"
+ "apihelp-wikispeech-example-2": "{{doc-apihelp-example|wikispeech}}",
+ "apierror-wikispeech-removetagsinvalidjson": "{{doc-apierror}}",
+ "apierror-wikispeech-removetagsinvalid": "{{doc-apierror}}"
}
diff --git a/includes/ApiWikispeech.php b/includes/ApiWikispeech.php
index 2862d26..140aa81 100644
--- a/includes/ApiWikispeech.php
+++ b/includes/ApiWikispeech.php
@@ -19,12 +19,66 @@
$this->dieWithError( [ 'apierror-paramempty', 'output'
] );
}
$pageContent = $this->getPageContent( $parameters['page'] );
+ $result = FormatJson::parse(
+ $parameters['removetags'],
+ FormatJson::FORCE_ASSOC
+ );
+ if ( !$result->isGood() ) {
+ $this->dieWithError( [
+ 'apierror-wikispeech-removetagsinvalidjson',
+ ''
+ ] );
+ }
+ $removeTags = $result->getValue();
+ if ( !$this->isValidRemoveTags( $removeTags ) ) {
+ $this->dieWithError( [
+ 'apierror-wikispeech-removetagsinvalid',
+ ''
+ ] );
+ }
$this->processPageContent(
$pageContent,
$parameters['output'],
- json_decode( $parameters['removetags'], true ),
+ $removeTags,
$parameters['segmentbreakingtags']
);
+ }
+
+ /**
+* Tests if a variable is valid as "remove tags".
+*
+* The variable should be an associative array. Keys should be
+
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RawAction: Add json to the allowed content types
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/384089 )
Change subject: RawAction: Add json to the allowed content types
..
RawAction: Add json to the allowed content types
This is not the best way to handle json type but
I'm trying to clean this up a little in other patches
Bug: T178060
Change-Id: Ia6d0c4b8c1062966da48e3bebf057c621b39ba87
---
M includes/actions/RawAction.php
1 file changed, 7 insertions(+), 1 deletion(-)
Approvals:
Hoo man: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/actions/RawAction.php b/includes/actions/RawAction.php
index d8c8bc3..be10ae4 100644
--- a/includes/actions/RawAction.php
+++ b/includes/actions/RawAction.php
@@ -236,7 +236,13 @@
}
}
- $allowedCTypes = [ 'text/x-wiki', 'text/javascript',
'text/css', 'application/x-zope-edit' ];
+ $allowedCTypes = [
+ 'text/x-wiki',
+ 'text/javascript',
+ 'text/css',
+ 'application/x-zope-edit',
+ 'application/json'
+ ];
if ( $ctype == '' || !in_array( $ctype, $allowedCTypes ) ) {
$ctype = 'text/x-wiki';
}
--
To view, visit https://gerrit.wikimedia.org/r/384089
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia6d0c4b8c1062966da48e3bebf057c621b39ba87
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Ladsgroup
Gerrit-Reviewer: Brian Wolff
Gerrit-Reviewer: Daniel Kinzler
Gerrit-Reviewer: Hoo man
Gerrit-Reviewer: Ladsgroup
Gerrit-Reviewer: Legoktm
Gerrit-Reviewer: Lucas Werkmeister (WMDE)
Gerrit-Reviewer: Thiemo Mättig (WMDE)
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...WikibaseQualityConstraints[master]: Fix sorting of NullResults
Lucas Werkmeister (WMDE) has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/386597 )
Change subject: Fix sorting of NullResults
..
Fix sorting of NullResults
Commit a4c1832358 (change I60ad838dda) introduced the NullResult type,
which is a fake result holding no constraint to ensure that certain
contexts still appear in the API response even if they have no
constraints defined on them. However, the DelegatingConstraintChecker
sometimes look at the constraint of a result: when sorting the results,
it first sorts by status, then by snak, but if those are identical, then
it looks at the constraint type. If there are two identical statements
on an entity included in a constraint check, they will both add a
NullResult to the result list, and the comparer will blow up trying to
compare the two NullResults, since the snaks are identical.
Bug: T179038
Change-Id: I48ac2d947020f4dbf3c6c87ec5c098a4114de373
---
M includes/ConstraintCheck/DelegatingConstraintChecker.php
1 file changed, 8 insertions(+), 0 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseQualityConstraints
refs/changes/97/386597/1
diff --git a/includes/ConstraintCheck/DelegatingConstraintChecker.php
b/includes/ConstraintCheck/DelegatingConstraintChecker.php
index 198fef6..869381f 100644
--- a/includes/ConstraintCheck/DelegatingConstraintChecker.php
+++ b/includes/ConstraintCheck/DelegatingConstraintChecker.php
@@ -19,6 +19,7 @@
use WikibaseQuality\ConstraintReport\ConstraintCheck\Helper\LoggingHelper;
use
WikibaseQuality\ConstraintReport\ConstraintCheck\Helper\SparqlHelperException;
use WikibaseQuality\ConstraintReport\ConstraintCheck\Result\CheckResult;
+use WikibaseQuality\ConstraintReport\ConstraintCheck\Result\NullResult;
use WikibaseQuality\ConstraintReport\ConstraintLookup;
use WikibaseQuality\ConstraintReport\Constraint;
use Wikibase\DataModel\Entity\EntityId;
@@ -573,6 +574,13 @@
$hashB =
$b->getContext()->getSnak()->getHash();
if ( $hashA === $hashB ) {
+ if ( $a instanceof NullResult )
{
+ return $b instanceof
NullResult ? 0 : -1;
+ }
+ if ( $b instanceof NullResult )
{
+ return $a instanceof
NullResult ? 0 : 1;
+ }
+
$typeA =
$a->getConstraint()->getConstraintTypeItemId();
$typeB =
$b->getConstraint()->getConstraintTypeItemId();
--
To view, visit https://gerrit.wikimedia.org/r/386597
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I48ac2d947020f4dbf3c6c87ec5c098a4114de373
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikibaseQualityConstraints
Gerrit-Branch: master
Gerrit-Owner: Lucas Werkmeister (WMDE)
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] translatewiki[master]: Update of config file in regards to changes in BlueSpiceExte...
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/385360 ) Change subject: Update of config file in regards to changes in BlueSpiceExtensions .. Update of config file in regards to changes in BlueSpiceExtensions BlueSpiceExtensions/PermissionManager -> BlueSpicePermissionManager: https://gerrit.wikimedia.org/r/#/c/384954/ https://gerrit.wikimedia.org/r/#/c/385356/ BlueSpiceExtensions/GroupManager -> BlueSpiceGroupManager: https://gerrit.wikimedia.org/r/#/c/384967/ https://gerrit.wikimedia.org/r/#/c/385355/ BlueSpiceExtensions/Readers -> BlueSpiceReaders: https://gerrit.wikimedia.org/r/#/c/384974/ https://gerrit.wikimedia.org/r/#/c/385358/ BlueSpiceExtensions/UserPreferences -> BlueSpiceUserPreferences: https://gerrit.wikimedia.org/r/#/c/384974/ https://gerrit.wikimedia.org/r/#/c/385357/ This commit based on https://phabricator.wikimedia.org/T143106 Change-Id: I7b2c71b660cb73a10827e694dbbf609a4534cd23 --- M groups/MediaWiki/mediawiki-extensions.txt 1 file changed, 12 insertions(+), 15 deletions(-) Approvals: Raimond Spekking: Looks good to me, approved jenkins-bot: Verified diff --git a/groups/MediaWiki/mediawiki-extensions.txt b/groups/MediaWiki/mediawiki-extensions.txt index 17856b2..2b2911a 100644 --- a/groups/MediaWiki/mediawiki-extensions.txt +++ b/groups/MediaWiki/mediawiki-extensions.txt @@ -279,11 +279,6 @@ descmsg = bs-formattinghelp-desc file = BlueSpiceExtensions/FormattingHelp/i18n/%CODE%.json -Blue Spice - GroupManager -id = ext-bs-groupmanager -descmsg = bs-groupmanager-desc -file = BlueSpiceExtensions/GroupManager/i18n/%CODE%.json - Blue Spice - Hide Title id = ext-bs-hidetitle descmsg = bs-hidetitle-desc @@ -349,11 +344,6 @@ aliasfile = BlueSpiceExtensions/Preferences/includes/specials/SpecialBlueSpicePreferences.alias.php optional = prefs-bluespice -Blue Spice - Readers -id = ext-bs-readers -descmsg = bs-readers-desc -file = BlueSpiceExtensions/Readers/i18n/%CODE%.json - Blue Spice - RSS Feeder id = ext-bs-rssfeeder descmsg = bs-rssfeeder-desc @@ -405,11 +395,6 @@ descmsg = bs-usagetracker-desc file = BlueSpiceExtensions/UsageTracker/i18n/%CODE%.json -Blue Spice - User Preferences -id = ext-bs-userpreferences -descmsg = bs-userpreferences-desc -file = BlueSpiceExtensions/UserPreferences/i18n/%CODE%.json - Blue Spice - User Sidebar id = ext-bs-usersidebar descmsg = bs-usersidebar-desc @@ -458,6 +443,9 @@ descmsg = bs-statistics-desc aliasfile = BlueSpiceExtendedStatistics/includes/specials/SpecialExtendedStatistics.alias.php +Blue Spice Group Manager +descmsg = bs-groupmanager-desc + Blue Spice Insert Template descmsg = bs-insertTemplate-desc @@ -475,6 +463,12 @@ Blue Spice Page Version descmsg = bs-pageversion-desc +Blue Spice Permission Manager +descmsg = bs-permissionmanager-desc + +Blue Spice Readers +descmsg = bs-readers-desc + Blue Spice Smartlist descmsg = bs-smartlist-desc @@ -484,6 +478,9 @@ descmsg = bs-usermanager-desc aliasfile = BlueSpiceUserManager/includes/specials/SpecialUserManager.alias.php +Blue Spice User Preferences +descmsg = bs-userpreferences-desc + # Boiler Plate excluded per T156569 Book Manager -- To view, visit https://gerrit.wikimedia.org/r/385360 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7b2c71b660cb73a10827e694dbbf609a4534cd23 Gerrit-PatchSet: 5 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: ItSpiderman Gerrit-Reviewer: ItSpiderman Gerrit-Reviewer: Raimond Spekking 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...Wikidata[wmf/1.31.0-wmf.5]: Make search for titles be always uppercase
Ladsgroup has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/386598 )
Change subject: Make search for titles be always uppercase
..
Make search for titles be always uppercase
Fortunately, wikidata titles are uppercase.
We may need better solution, but that may require full
reindex.
Bug: T179045
Change-Id: I3471c833108a88d6ee8436e48c587c7e7e08b93f
---
M extensions/Wikibase/repo/includes/Search/Elastic/EntitySearchElastic.php
M
extensions/Wikibase/repo/tests/phpunit/data/entitySearch/search_de-ch-en.expected
M extensions/Wikibase/repo/tests/phpunit/data/entitySearch/search_de-ch.expected
M
extensions/Wikibase/repo/tests/phpunit/data/entitySearch/search_de-ch_strict.expected
M extensions/Wikibase/repo/tests/phpunit/data/entitySearch/search_en.expected
M
extensions/Wikibase/repo/tests/phpunit/data/entitySearch/search_en_strict.expected
A extensions/Wikibase/repo/tests/phpunit/data/entitySearch/search_id.expected
A extensions/Wikibase/repo/tests/phpunit/data/entitySearch/search_id.query
8 files changed, 187 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata
refs/changes/98/386598/1
diff --git
a/extensions/Wikibase/repo/includes/Search/Elastic/EntitySearchElastic.php
b/extensions/Wikibase/repo/includes/Search/Elastic/EntitySearchElastic.php
index 5e94101..b80bfcc 100644
--- a/extensions/Wikibase/repo/includes/Search/Elastic/EntitySearchElastic.php
+++ b/extensions/Wikibase/repo/includes/Search/Elastic/EntitySearchElastic.php
@@ -187,7 +187,9 @@
$labelsQuery = new BoolQuery();
$labelsQuery->addFilter( $labelsFilter );
$labelsQuery->addMust( $dismax );
- $titleMatch = new Term( [ 'title.keyword' => $text ] );
+ // TODO: this is a bit hacky, better way would be to make the
field case-insensitive
+ // or add new subfiled which is case-insensitive
+ $titleMatch = new Term( [ 'title.keyword' => strtoupper( $text
) ] );
// Match either labels or exact match to title
$query->addShould( $labelsQuery );
diff --git
a/extensions/Wikibase/repo/tests/phpunit/data/entitySearch/search_de-ch-en.expected
b/extensions/Wikibase/repo/tests/phpunit/data/entitySearch/search_de-ch-en.expected
index 48d79ef..4a28724 100644
---
a/extensions/Wikibase/repo/tests/phpunit/data/entitySearch/search_de-ch-en.expected
+++
b/extensions/Wikibase/repo/tests/phpunit/data/entitySearch/search_de-ch-en.expected
@@ -129,7 +129,7 @@
},
{
"term": {
-"title.keyword": "Wien"
+"title.keyword": "WIEN"
}
}
],
diff --git
a/extensions/Wikibase/repo/tests/phpunit/data/entitySearch/search_de-ch.expected
b/extensions/Wikibase/repo/tests/phpunit/data/entitySearch/search_de-ch.expected
index 48ef5ea..81b6ba1 100644
---
a/extensions/Wikibase/repo/tests/phpunit/data/entitySearch/search_de-ch.expected
+++
b/extensions/Wikibase/repo/tests/phpunit/data/entitySearch/search_de-ch.expected
@@ -129,7 +129,7 @@
},
{
"term": {
-"title.keyword": "Wien"
+"title.keyword": "WIEN"
}
}
],
diff --git
a/extensions/Wikibase/repo/tests/phpunit/data/entitySearch/search_de-ch_strict.expected
b/extensions/Wikibase/repo/tests/phpunit/data/entitySearch/search_de-ch_strict.expected
index bc3b388..2163aca 100644
---
a/extensions/Wikibase/repo/tests/phpunit/data/entitySearch/search_de-ch_strict.expected
+++
b/extensions/Wikibase/repo/tests/phpunit/data/entitySearch/search_de-ch_strict.expected
@@ -59,7 +59,7 @@
},
{
"term": {
-"title.keyword": "Wien"
+"title.keyword": "WIEN"
}
}
],
diff --git
a/extensions/Wikibase/repo/tests/phpunit/data/entitySearch/search_en.expected
b/extensions/Wikibase/repo/tests/phpunit/data/entitySearch/search_en.expected
index 857c6bf..e745659 100644
---
a/extensions/Wikibase/repo/tests/phpunit/data/entitySearch/search_en.expected
+++
b/extensions/Wikibase/repo/tests/phpunit/data/entitySearch/search_en.expected
@@ -69,7 +69,7 @@
},
{
"term": {
-"title.keyword": "Duck"
+"title.keyword": "DUCK"
}
}
],
diff --git
a/extensions/Wikibase/repo/tests/phpunit/data/entitySearch/search_en_strict.expected
b/extensions/Wikibase/repo/tests/phpu
[MediaWiki-commits] [Gerrit] mediawiki...EventBus[master]: Improved logging for JobExecutor
Ppchelko has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/386599 )
Change subject: Improved logging for JobExecutor
..
Improved logging for JobExecutor
Change-Id: If2a27d3c98bfa30b3f197151d13a4348e7eadc3e
---
M JobExecutor.php
1 file changed, 41 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/EventBus
refs/changes/99/386599/1
diff --git a/JobExecutor.php b/JobExecutor.php
index b649c63..90e98e3 100644
--- a/JobExecutor.php
+++ b/JobExecutor.php
@@ -24,7 +24,11 @@
$jobCreateResult = $this->getJobFromParams( $jobEvent );
if ( !$jobCreateResult['status'] ) {
- $this->logger()->error( $jobCreateResult['message'] );
+ $this->logger()->error( 'Failed creating job from
description',
+ [
+ 'job_type' => $jobEvent['type'],
+ 'message' =>
$jobCreateResult['message']
+ ]);
return $jobCreateResult;
}
@@ -39,11 +43,30 @@
$lbFactory->beginMasterChanges( $fnameTrxOwner );
$status = $job->run();
- $message = $job->getLastError();
$lbFactory->commitMasterChanges( $fnameTrxOwner );
- if ( !$status ) {
- $this->logger()->error( $job->toString() . "
error={$message}" );
+ if ( $status !== false ) {
+ $message = $job->getLastError();
+ $this->logger()->error( 'Failed executing job:
' . $job->toString(),
+ [
+ 'job_type' => $job->getType(),
+ 'error'=> $message
+ ]
+ );
+ } else if ( !is_bool( $status ) ) {
+ $message = 'Success, but no status returned';
+ $this->logger()->warning( 'Non-boolean result
returned by job: ' . $job->toString(),
+ [
+ 'job_type' => $job->getType(),
+ 'job_result' => isset( $status
) ? $status : 'unset'
+ ]
+ );
+ // For backwards compatibility with old job
executor we should set the status
+ // to true here, as before anything other then
boolean false was considered a success.
+ // TODO: After all the jobs are fixed to return
proper result this should be removed.
+ $status = true;
+ } else {
+ $message = 'success';
}
// Important: this must be the last deferred update
added (T100085, T154425)
@@ -53,20 +76,30 @@
} catch ( Exception $e ) {
MWExceptionHandler::rollbackMasterChangesAndLog( $e );
$status = false;
- $message = 'Error executing job: '
+ $message = 'Exception executing job: '
. $job->toString() . ' : '
. get_class( $e ) . ': ' .
$e->getMessage();
- $this->logger()->error( $message );
+ $this->logger()->error( $message,
+ [
+ 'job_type' => $job->getType(),
+ 'exception' => $e
+ ]
+ );
}
// Always attempt to call teardown() even if Job throws
exception.
try {
$job->teardown( $status );
} catch ( Exception $e ) {
- $message = 'Error tearing down job: '
+ $message = 'Exception tearing down job: '
. $job->toString() . ' : '
. get_class( $e ) . ': ' .
$e->getMessage();
- $this->logger()->error( $message );
+ $this->logger()->error( $message,
+ [
+ 'job_type' => $job->getType(),
+ 'exception' => $e
+ ]
+ );
}
// The JobRunner at this
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad.php: Clean up comments
Marostegui has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/386600 ) Change subject: db-eqiad.php: Clean up comments .. db-eqiad.php: Clean up comments Change-Id: If1bc037a208dd24521009788eb325f77be70e9b9 --- M wmf-config/db-eqiad.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/00/386600/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index a29d769..0f6852a 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -126,7 +126,7 @@ # 'db1038' => 0, # B2 1.4TB 64GB, vslow, dump, old master # T172679 'db1044' => 0, # B2 1.4TB 64GB, #Temporary master for db1095 - new sanitarium #T150802 'db1072' => 0, # B2 2.8TB 160GB, vslow, dump, old master - 'db1077' => 400, # B1 3.6TB 512GB #temporary special slave - T172679 + 'db1077' => 400, # B1 3.6TB 512GB 'db1078' => 500, # C3 3.6TB 512GB # 'db1103' => 0, # A3 3.6TB 512GB, # not needed on s3 - has db1035's data that we have to checksum ], -- To view, visit https://gerrit.wikimedia.org/r/386600 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If1bc037a208dd24521009788eb325f77be70e9b9 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Marostegui ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad.php: Clean up comments
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/386600 ) Change subject: db-eqiad.php: Clean up comments .. db-eqiad.php: Clean up comments Change-Id: If1bc037a208dd24521009788eb325f77be70e9b9 --- M wmf-config/db-eqiad.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Marostegui: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index a29d769..328a887 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -126,7 +126,7 @@ # 'db1038' => 0, # B2 1.4TB 64GB, vslow, dump, old master # T172679 'db1044' => 0, # B2 1.4TB 64GB, #Temporary master for db1095 - new sanitarium #T150802 'db1072' => 0, # B2 2.8TB 160GB, vslow, dump, old master - 'db1077' => 400, # B1 3.6TB 512GB #temporary special slave - T172679 + 'db1077' => 400, # B1 3.6TB 512GB, watchlist, recentchanges, contributions, logpager 'db1078' => 500, # C3 3.6TB 512GB # 'db1103' => 0, # A3 3.6TB 512GB, # not needed on s3 - has db1035's data that we have to checksum ], -- To view, visit https://gerrit.wikimedia.org/r/386600 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If1bc037a208dd24521009788eb325f77be70e9b9 Gerrit-PatchSet: 2 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Marostegui Gerrit-Reviewer: Marostegui Gerrit-Reviewer: Urbanecm Gerrit-Reviewer: Zoranzoki21 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...WikibaseMediaInfo[master]: Bind against FieldDefinitions interface instead of implement...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/384047 )
Change subject: Bind against FieldDefinitions interface instead of
implementation
..
Bind against FieldDefinitions interface instead of implementation
Same as Ic2022a4, which you also might want to review.
Bug: T175199
Change-Id: Ib5e70a42e3bd37cd2dad2455e0a11ab3888ddd7a
---
M src/Content/MediaInfoHandler.php
1 file changed, 4 insertions(+), 4 deletions(-)
Approvals:
Hoo man: Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/Content/MediaInfoHandler.php b/src/Content/MediaInfoHandler.php
index cf0beb4..b149ba3 100644
--- a/src/Content/MediaInfoHandler.php
+++ b/src/Content/MediaInfoHandler.php
@@ -15,9 +15,9 @@
use Wikibase\MediaInfo\Actions\ViewMediaInfoAction;
use Wikibase\MediaInfo\DataModel\MediaInfo;
use Wikibase\MediaInfo\DataModel\MediaInfoId;
-use Wikibase\MediaInfo\Search\MediaInfoFieldDefinitions;
use Wikibase\MediaInfo\Services\FilePageLookup;
use Wikibase\Repo\Content\EntityHandler;
+use Wikibase\Repo\Search\Elastic\Fields\FieldDefinitions;
use Wikibase\Repo\Validators\EntityConstraintProvider;
use Wikibase\Repo\Validators\ValidatorErrorLocalizer;
use Wikibase\Store\EntityIdLookup;
@@ -60,7 +60,7 @@
* @param LanguageFallbackLabelDescriptionLookupFactory
$labelLookupFactory
* @param MissingMediaInfoHandler $missingMediaInfoHandler
* @param FilePageLookup $filePageLookup
-* @param MediaInfoFieldDefinitions $fieldDefinitions
+* @param FieldDefinitions $mediaInfoFieldDefinitions
* @param callable|null $legacyExportFormatDetector
*/
public function __construct(
@@ -73,7 +73,7 @@
LanguageFallbackLabelDescriptionLookupFactory
$labelLookupFactory,
MissingMediaInfoHandler $missingMediaInfoHandler,
FilePageLookup $filePageLookup,
- MediaInfoFieldDefinitions $fieldDefinitions,
+ FieldDefinitions $mediaInfoFieldDefinitions,
$legacyExportFormatDetector = null
) {
parent::__construct(
@@ -83,7 +83,7 @@
$constraintProvider,
$errorLocalizer,
$entityIdParser,
- $fieldDefinitions,
+ $mediaInfoFieldDefinitions,
$legacyExportFormatDetector
);
$this->entityIdLookup = $entityIdLookup;
--
To view, visit https://gerrit.wikimedia.org/r/384047
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib5e70a42e3bd37cd2dad2455e0a11ab3888ddd7a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikibaseMediaInfo
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE)
Gerrit-Reviewer: Addshore
Gerrit-Reviewer: Aude
Gerrit-Reviewer: Hoo man
Gerrit-Reviewer: Ladsgroup
Gerrit-Reviewer: Smalyshev
Gerrit-Reviewer: Thiemo Mättig (WMDE)
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Fix setup of libapache2-mod-security2 on stretch
Muehlenhoff has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/384713 )
Change subject: Fix setup of libapache2-mod-security2 on stretch
..
Fix setup of libapache2-mod-security2 on stretch
Starting with stretch libapache2-mod-security2 includes the following
in /etc/apache2/mods-enabled/security2.conf:
# Include OWASP ModSecurity CRS rules if installed
IncludeOptional /usr/share/modsecurity-crs/owasp-crs*.load
The directory /usr/share/modsecurity-crs is shipped by the modsecurity-crs
package, but it's only a Recommends: of libapache2-mod-security2, so it
doesn't get installed. And IncludeOptional is only optional for the full
path, so if /usr/share/modsecurity-crs doesn't exist, it bails out and
Apache refuses to start/restart. As such, ship an empty directory to make
that include truly optional
Bug: T174431
Change-Id: Idc9c7853d5b5c81662d063a2a19ce089920bbbff
---
M modules/mediawiki/manifests/web.pp
1 file changed, 20 insertions(+), 0 deletions(-)
Approvals:
Muehlenhoff: Looks good to me, approved
Elukey: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/modules/mediawiki/manifests/web.pp
b/modules/mediawiki/manifests/web.pp
index fa13ca5..ec27dd5 100644
--- a/modules/mediawiki/manifests/web.pp
+++ b/modules/mediawiki/manifests/web.pp
@@ -21,6 +21,26 @@
require => Package['apache2'],
}
+# Starting with stretch libapache2-mod-security2 includes the following
+# in /etc/apache2/mods-enabled/security2.conf:
+# # Include OWASP ModSecurity CRS rules if installed
+# IncludeOptional /usr/share/modsecurity-crs/owasp-crs*.load
+# The directory /usr/share/modsecurity-crs is shipped by the
+# modsecurity-crs package, but it's only a Recommends: of
+# libapache2-mod-security2, so it doesn'get installed. And IncludeOptional
+# is only optional for the full path, so if /usr/share/modsecurity-crs
doesn't
+# exist, it bails out and apache refuses to start/restart. As such, ship an
+# empty directory to make that include truly optional
+if os_version('debian >= stretch') {
+file { '/usr/share/modsecurity-crs':
+ensure => directory,
+owner => 'root',
+group => 'root',
+mode => '0775',
+before => Service['apache2'],
+}
+}
+
file { '/var/lock/apache2':
ensure => directory,
owner => $::mediawiki::users::web,
--
To view, visit https://gerrit.wikimedia.org/r/384713
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idc9c7853d5b5c81662d063a2a19ce089920bbbff
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff
Gerrit-Reviewer: Alex Monk
Gerrit-Reviewer: Elukey
Gerrit-Reviewer: Giuseppe Lavagetto
Gerrit-Reviewer: Muehlenhoff
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...Wikibase[master]: Fix typo
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/386595 ) Change subject: Fix typo .. Fix typo Change-Id: Ibe30b7b916ea48b59e72f8ba2827845bc699194f --- M repo/includes/Search/Elastic/EntitySearchElastic.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Hoo man: Looks good to me, approved jenkins-bot: Verified diff --git a/repo/includes/Search/Elastic/EntitySearchElastic.php b/repo/includes/Search/Elastic/EntitySearchElastic.php index 9dd9755..7452a2f 100644 --- a/repo/includes/Search/Elastic/EntitySearchElastic.php +++ b/repo/includes/Search/Elastic/EntitySearchElastic.php @@ -191,7 +191,7 @@ $labelsQuery->addFilter( $labelsFilter ); $labelsQuery->addMust( $dismax ); // TODO: this is a bit hacky, better way would be to make the field case-insensitive - // or add new subfiled which is case-insensitive + // or add new subfield which is case-insensitive $titleMatch = new Term( [ 'title.keyword' => strtoupper( $text ) ] ); // Match either labels or exact match to title -- To view, visit https://gerrit.wikimedia.org/r/386595 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibe30b7b916ea48b59e72f8ba2827845bc699194f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Ladsgroup Gerrit-Reviewer: Hoo man 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...Wikidata[master]: New Wikidata Build - 2017-10-26T10:00:01+0000
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/386596 )
Change subject: New Wikidata Build - 2017-10-26T10:00:01+
..
New Wikidata Build - 2017-10-26T10:00:01+
Change-Id: I74c3f354260d86624f2120f3d1ae8ed3dca67989
---
M composer.lock
M extensions/Constraints/i18n/he.json
M extensions/Wikibase/client/i18n/tg-cyrl.json
M extensions/Wikibase/docs/options.wiki
M extensions/Wikibase/repo/Wikibase.hooks.php
M extensions/Wikibase/repo/Wikibase.php
M extensions/Wikibase/repo/config/ElasticSearchRescoreFunctions.php
M extensions/Wikibase/repo/config/ElasticSearchRescoreProfiles.php
M extensions/Wikibase/repo/config/Wikibase.default.php
M extensions/Wikibase/repo/i18n/ja.json
M extensions/Wikibase/repo/i18n/tr.json
M extensions/Wikibase/repo/includes/Search/Elastic/ElasticTermResult.php
M extensions/Wikibase/repo/includes/Search/Elastic/EntitySearchElastic.php
A
extensions/Wikibase/repo/includes/Search/Elastic/StatementBoostScoreBuilder.php
M extensions/Wikibase/repo/includes/Search/Elastic/WikibasePrefixSearcher.php
M extensions/Wikibase/repo/includes/WikibaseRepo.php
M
extensions/Wikibase/repo/tests/phpunit/data/entitySearch/search_de-ch-en.expected
M extensions/Wikibase/repo/tests/phpunit/data/entitySearch/search_de-ch.expected
M
extensions/Wikibase/repo/tests/phpunit/data/entitySearch/search_de-ch_strict.expected
M extensions/Wikibase/repo/tests/phpunit/data/entitySearch/search_en.expected
M
extensions/Wikibase/repo/tests/phpunit/data/entitySearch/search_en_strict.expected
A extensions/Wikibase/repo/tests/phpunit/data/entitySearch/search_id.expected
A extensions/Wikibase/repo/tests/phpunit/data/entitySearch/search_id.query
M
extensions/Wikibase/repo/tests/phpunit/includes/Search/Elastic/ElasticTermResultTest.php
A
extensions/Wikibase/repo/tests/phpunit/includes/Search/Elastic/StatementBoostScoreBuilderTest.php
A extensions/Wikidata.org/i18n/tr.json
M vendor/composer/autoload_classmap.php
M vendor/composer/autoload_static.php
M vendor/composer/installed.json
D vendor/data-values/serialization/.gitignore
D vendor/data-values/serialization/.scrutinizer.yml
D vendor/data-values/serialization/.travis.yml
M vendor/data-values/serialization/README.md
D vendor/data-values/serialization/composer.json
D vendor/data-values/serialization/phpcs.xml
D vendor/data-values/serialization/phpunit.xml.dist
M vendor/data-values/serialization/src/Deserializers/DataValueDeserializer.php
D
vendor/data-values/serialization/tests/Deserializers/DataValueDeserializerTest.php
D vendor/data-values/serialization/tests/Serializers/DataValueSerializerTest.php
D vendor/data-values/serialization/tests/bootstrap.php
40 files changed, 468 insertions(+), 552 deletions(-)
Approvals:
WMDE-leszek: Looks good to me, approved
jenkins-bot: Verified
diff --git a/composer.lock b/composer.lock
index 84117d4..c03e2d9 100644
--- a/composer.lock
+++ b/composer.lock
@@ -534,26 +534,26 @@
},
{
"name": "data-values/serialization",
-"version": "1.2.1",
+"version": "1.2.2",
"source": {
"type": "git",
"url": "https://github.com/DataValues/Serialization.git";,
-"reference": "2e81e60e413f1578fbaddb9dd2fbcc8236825806"
+"reference": "d849fc1a2f00f22027d504c4e70fd00a0c6a7579"
},
"dist": {
"type": "zip",
-"url":
"https://api.github.com/repos/DataValues/Serialization/zipball/2e81e60e413f1578fbaddb9dd2fbcc8236825806";,
-"reference": "2e81e60e413f1578fbaddb9dd2fbcc8236825806",
+"url":
"https://api.github.com/repos/DataValues/Serialization/zipball/d849fc1a2f00f22027d504c4e70fd00a0c6a7579";,
+"reference": "d849fc1a2f00f22027d504c4e70fd00a0c6a7579",
"shasum": ""
},
"require": {
"data-values/data-values": "~1.0|~0.1",
"php": ">=5.5.9",
-"serialization/serialization": "~3.0"
+"serialization/serialization": "~4.0|~3.0"
},
"require-dev": {
-"mediawiki/mediawiki-codesniffer": ">=0.4 <0.8",
-"phpunit/phpunit": "~4.8"
+"phpunit/phpunit": "~4.8",
+"wikibase/wikibase-codesniffer": "^0.2.0"
},
"type": "library",
"extra": {
@@ -588,7 +588,7 @@
"serializers",
"wikidata"
],
-"time": "2017-06-26 07:24:35"
+"time": "2017-10-25 13:47:05"
},
{
"name": "data-values/time",
@@ -918,7 +918,7 @@
"source": {
"type": "git",
"url":
"https://gerrit.wikimedia.org/r/mediawiki/extensions/Wikidata.org";,
-"reference": "764890c0924f0a011b58
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Add upstream bug references
Muehlenhoff has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/386601 )
Change subject: Add upstream bug references
..
Add upstream bug references
Change-Id: Ibc96942acc68d4fa0063e7d46578a4aff5b2b463
---
M modules/mediawiki/manifests/web.pp
1 file changed, 2 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/01/386601/1
diff --git a/modules/mediawiki/manifests/web.pp
b/modules/mediawiki/manifests/web.pp
index ec27dd5..cef6796 100644
--- a/modules/mediawiki/manifests/web.pp
+++ b/modules/mediawiki/manifests/web.pp
@@ -31,6 +31,8 @@
# is only optional for the full path, so if /usr/share/modsecurity-crs
doesn't
# exist, it bails out and apache refuses to start/restart. As such, ship an
# empty directory to make that include truly optional
+# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=878920
+# https://bz.apache.org/bugzilla/show_bug.cgi?id=57585
if os_version('debian >= stretch') {
file { '/usr/share/modsecurity-crs':
ensure => directory,
--
To view, visit https://gerrit.wikimedia.org/r/386601
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibc96942acc68d4fa0063e7d46578a4aff5b2b463
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Add upstream bug references
Muehlenhoff has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/386601 )
Change subject: Add upstream bug references
..
Add upstream bug references
Change-Id: Ibc96942acc68d4fa0063e7d46578a4aff5b2b463
---
M modules/mediawiki/manifests/web.pp
1 file changed, 2 insertions(+), 0 deletions(-)
Approvals:
Muehlenhoff: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/mediawiki/manifests/web.pp
b/modules/mediawiki/manifests/web.pp
index ec27dd5..cef6796 100644
--- a/modules/mediawiki/manifests/web.pp
+++ b/modules/mediawiki/manifests/web.pp
@@ -31,6 +31,8 @@
# is only optional for the full path, so if /usr/share/modsecurity-crs
doesn't
# exist, it bails out and apache refuses to start/restart. As such, ship an
# empty directory to make that include truly optional
+# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=878920
+# https://bz.apache.org/bugzilla/show_bug.cgi?id=57585
if os_version('debian >= stretch') {
file { '/usr/share/modsecurity-crs':
ensure => directory,
--
To view, visit https://gerrit.wikimedia.org/r/386601
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibc96942acc68d4fa0063e7d46578a4aff5b2b463
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff
Gerrit-Reviewer: Muehlenhoff
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...Wikibase[master]: Add integration tests for pasting full URLs into entity sele...
Thiemo Mättig (WMDE) has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/386602 ) Change subject: Add integration tests for pasting full URLs into entity selectors .. Add integration tests for pasting full URLs into entity selectors Bug: T179061 Change-Id: I411b09bda8abaab360ade781a3f92d8b94c61c89 --- M repo/tests/phpunit/includes/Api/SearchEntitiesTest.php 1 file changed, 10 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/02/386602/1 diff --git a/repo/tests/phpunit/includes/Api/SearchEntitiesTest.php b/repo/tests/phpunit/includes/Api/SearchEntitiesTest.php index f374666..146603a 100644 --- a/repo/tests/phpunit/includes/Api/SearchEntitiesTest.php +++ b/repo/tests/phpunit/includes/Api/SearchEntitiesTest.php @@ -317,6 +317,16 @@ [ $q111Match ], [ $q111Result ], ], + 'Copy paste with brackets' => [ + [ 'search' => '(Q111)' ], + [ $q111Match ], + [ $q111Result ], + ], + 'Copy pasted full URL' => [ + [ 'search' => 'https://www.wikidata.org/wiki/Q111' ], + [ $q111Match ], + [ $q111Result ], + ], 'Multiple Results' => [ [], [ $q222Match, $q333Match ], -- To view, visit https://gerrit.wikimedia.org/r/386602 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I411b09bda8abaab360ade781a3f92d8b94c61c89 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Thiemo Mättig (WMDE) ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: hieradata: expand SMART health check rollout in codfw
Filippo Giunchedi has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/386603 ) Change subject: hieradata: expand SMART health check rollout in codfw .. hieradata: expand SMART health check rollout in codfw Select a few host "classes" based on hostname prefix to install smartmontools and export SMART attributes once an hour. Bug: T86552 Change-Id: I9d545dbde29ea3bec68645735e8556a9a151185a --- M hieradata/hosts/db2044.yaml M hieradata/hosts/db2079.yaml D hieradata/hosts/eventlog2001.yaml D hieradata/hosts/labtestservices2001.yaml D hieradata/hosts/ms-be2015.yaml D hieradata/hosts/ms-be2020.yaml D hieradata/hosts/ms-fe2005.yaml M hieradata/hosts/mwlog2001.yaml D hieradata/hosts/thumbor2001.yaml M hieradata/regex.yaml 10 files changed, 5 insertions(+), 9 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/03/386603/1 diff --git a/hieradata/hosts/db2044.yaml b/hieradata/hosts/db2044.yaml index 2b323d0..7db8adb 100644 --- a/hieradata/hosts/db2044.yaml +++ b/hieradata/hosts/db2044.yaml @@ -1,2 +1 @@ mariadb::shard: 's4' -profile::base::check_smart: true diff --git a/hieradata/hosts/db2079.yaml b/hieradata/hosts/db2079.yaml index f149ed8..0d8bce2 100644 --- a/hieradata/hosts/db2079.yaml +++ b/hieradata/hosts/db2079.yaml @@ -1,2 +1 @@ mariadb::shard: 's5' -profile::base::check_smart: true diff --git a/hieradata/hosts/eventlog2001.yaml b/hieradata/hosts/eventlog2001.yaml deleted file mode 100644 index 9c155cc..000 --- a/hieradata/hosts/eventlog2001.yaml +++ /dev/null @@ -1 +0,0 @@ -profile::base::check_smart: true diff --git a/hieradata/hosts/labtestservices2001.yaml b/hieradata/hosts/labtestservices2001.yaml deleted file mode 100644 index 9c155cc..000 --- a/hieradata/hosts/labtestservices2001.yaml +++ /dev/null @@ -1 +0,0 @@ -profile::base::check_smart: true diff --git a/hieradata/hosts/ms-be2015.yaml b/hieradata/hosts/ms-be2015.yaml deleted file mode 100644 index 9c155cc..000 --- a/hieradata/hosts/ms-be2015.yaml +++ /dev/null @@ -1 +0,0 @@ -profile::base::check_smart: true diff --git a/hieradata/hosts/ms-be2020.yaml b/hieradata/hosts/ms-be2020.yaml deleted file mode 100644 index 9c155cc..000 --- a/hieradata/hosts/ms-be2020.yaml +++ /dev/null @@ -1 +0,0 @@ -profile::base::check_smart: true diff --git a/hieradata/hosts/ms-fe2005.yaml b/hieradata/hosts/ms-fe2005.yaml deleted file mode 100644 index 9c155cc..000 --- a/hieradata/hosts/ms-fe2005.yaml +++ /dev/null @@ -1 +0,0 @@ -profile::base::check_smart: true diff --git a/hieradata/hosts/mwlog2001.yaml b/hieradata/hosts/mwlog2001.yaml index 26312d6..19e695d 100644 --- a/hieradata/hosts/mwlog2001.yaml +++ b/hieradata/hosts/mwlog2001.yaml @@ -4,4 +4,3 @@ - mw-log-readers role::logging::mediawiki::udp2log::rsync_slow_parse: false role::logging::mediawiki::udp2log::forward_messages: false -profile::base::check_smart: true diff --git a/hieradata/hosts/thumbor2001.yaml b/hieradata/hosts/thumbor2001.yaml deleted file mode 100644 index 9c155cc..000 --- a/hieradata/hosts/thumbor2001.yaml +++ /dev/null @@ -1 +0,0 @@ -profile::base::check_smart: true diff --git a/hieradata/regex.yaml b/hieradata/regex.yaml index 87320bf..83851a6 100644 --- a/hieradata/regex.yaml +++ b/hieradata/regex.yaml @@ -344,3 +344,8 @@ __regex: !ruby/regexp /^(analytics|aqs|conf|cp|db|dbproxy|druid|elastic|es|etcd|ganeti|kafka)1\d\d\d\.eqiad\.wmnet$/ profile::base::remote_syslog_tls: ['syslog.eqiad.wmnet:6514', 'syslog.codfw.wmnet:6514'] profile::base::remote_syslog: [] + +# Gradual SMART health checking rollout - T86552 +smart_health_codfw: + __regex: !ruby/regexp /^(auth|conf|cp|db|dbstore|elastic|es|ganeti|graphite|maps-test|mc|ores|oresrdb|pc|rdb|restbase-test|sca|scb)2\d\d\d\.codfw\.wmnet$/ + profile::base::check_smart: true -- To view, visit https://gerrit.wikimedia.org/r/386603 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9d545dbde29ea3bec68645735e8556a9a151185a Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Filippo Giunchedi ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...CirrusSearch[master]: Add test which uses EmptyInterwikiResolver
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/386562 )
Change subject: Add test which uses EmptyInterwikiResolver
..
Add test which uses EmptyInterwikiResolver
Change-Id: I87287732f3b69fb63cb96984cf0b3f0b5102dfa1
---
M tests/unit/InterwikiResolverTest.php
1 file changed, 10 insertions(+), 0 deletions(-)
Approvals:
Cindy-the-browser-test-bot: Looks good to me, but someone else must approve
jenkins-bot: Verified
DCausse: Looks good to me, approved
diff --git a/tests/unit/InterwikiResolverTest.php
b/tests/unit/InterwikiResolverTest.php
index cd9b0e4..21be747 100644
--- a/tests/unit/InterwikiResolverTest.php
+++ b/tests/unit/InterwikiResolverTest.php
@@ -2,6 +2,7 @@
namespace CirrusSearch\Test;
+use CirrusSearch\EmptyInterwikiResolver;
use MediaWiki\MediaWikiServices;
use CirrusSearch\CirrusTestCase;
use CirrusSearch\CirrusConfigInterwikiResolver;
@@ -347,4 +348,13 @@
\MediaWiki\restoreWarnings();
return $fileContent;
}
+
+ public function testEmptyResolver() {
+ $config = new HashSearchConfig( [ '_wikiID' => 'dummy' ] );
+ $resolver = MediaWikiServices::getInstance()
+ ->getService( InterwikiResolverFactory::SERVICE )
+ ->getResolver( $config );
+ $this->assertInstanceOf( EmptyInterwikiResolver::class,
$resolver );
+ }
+
}
--
To view, visit https://gerrit.wikimedia.org/r/386562
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I87287732f3b69fb63cb96984cf0b3f0b5102dfa1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: Smalyshev
Gerrit-Reviewer: Cindy-the-browser-test-bot
Gerrit-Reviewer: DCausse
Gerrit-Reviewer: EBernhardson
Gerrit-Reviewer: Gehel
Gerrit-Reviewer: Tjones
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...WikidataPageBanner[master]: build: Bump various devDependencies to latest
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/386433 )
Change subject: build: Bump various devDependencies to latest
..
build: Bump various devDependencies to latest
eslint ^3.19.0 →4.9.0
eslint-config-wikimedia ^0.4.0 →0.5.0
grunt-banana-checker 0.4.0 →0.6.0
grunt-eslint ^19.0.0 → 20.1.0
grunt-jsonlint 1.0.7 →1.1.0
grunt-stylelint0.6.0 →0.8.0
Change-Id: I19667318887d97f1dac68f4e47a01d28b5e97a2f
---
M package.json
M
resources/ext.WikidataPageBanner.positionBanner/ext.WikidataPageBanner.positionBanner.js
2 files changed, 11 insertions(+), 11 deletions(-)
Approvals:
Esanders: Looks good to me, approved
jenkins-bot: Verified
diff --git a/package.json b/package.json
index 23d901d..f9bb60f 100644
--- a/package.json
+++ b/package.json
@@ -8,13 +8,13 @@
"test": "grunt test"
},
"devDependencies": {
-"eslint": "^3.19.0",
-"eslint-config-wikimedia": "^0.4.0",
+"eslint": "4.9.0",
+"eslint-config-wikimedia": "0.5.0",
"grunt": "1.0.1",
-"grunt-banana-checker": "0.4.0",
-"grunt-eslint": "^19.0.0",
-"grunt-jsonlint": "1.0.7",
-"grunt-stylelint": "0.6.0",
+"grunt-banana-checker": "0.6.0",
+"grunt-eslint": "20.1.0",
+"grunt-jsonlint": "1.1.0",
+"grunt-stylelint": "0.8.0",
"stylelint": "7.8.0",
"stylelint-config-wikimedia": "0.4.1"
}
diff --git
a/resources/ext.WikidataPageBanner.positionBanner/ext.WikidataPageBanner.positionBanner.js
b/resources/ext.WikidataPageBanner.positionBanner/ext.WikidataPageBanner.positionBanner.js
index c688f80..2e834e8 100644
---
a/resources/ext.WikidataPageBanner.positionBanner/ext.WikidataPageBanner.positionBanner.js
+++
b/resources/ext.WikidataPageBanner.positionBanner/ext.WikidataPageBanner.positionBanner.js
@@ -81,11 +81,11 @@
} );
}
$( window ).on( 'resize', $.debounce(
- 100,
- function () {
- positionBanner( $wpbBannerImageContainer );
- }
- ) );
+ 100,
+ function () {
+ positionBanner( $wpbBannerImageContainer );
+ }
+ ) );
// set focus after image has loaded
$img.load( function () {
positionBanner( $wpbBannerImageContainer );
--
To view, visit https://gerrit.wikimedia.org/r/386433
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I19667318887d97f1dac68f4e47a01d28b5e97a2f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikidataPageBanner
Gerrit-Branch: master
Gerrit-Owner: Jforrester
Gerrit-Reviewer: Esanders
Gerrit-Reviewer: Legoktm
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...3D[master]: build: Bump various devDependencies to latest
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/386429 )
Change subject: build: Bump various devDependencies to latest
..
build: Bump various devDependencies to latest
eslint-config-wikimedia 0.3.0 → 0.5.0
grunt-banana-checker 0.5.0 → 0.6.0
grunt-eslint 19.0.0 → 20.1.0
grunt-stylelint 0.7.0 → 0.8.0
Change-Id: I3b2f56c868f29b1ab445802b5be521f65638ff38
---
M package.json
1 file changed, 4 insertions(+), 4 deletions(-)
Approvals:
Esanders: Looks good to me, approved
jenkins-bot: Verified
diff --git a/package.json b/package.json
index 24436b1..fa1cc37 100644
--- a/package.json
+++ b/package.json
@@ -7,12 +7,12 @@
"test": "grunt test"
},
"devDependencies": {
- "eslint-config-wikimedia": "0.3.0",
+ "eslint-config-wikimedia": "0.5.0",
"grunt": "1.0.1",
- "grunt-banana-checker": "0.5.0",
- "grunt-eslint": "19.0.0",
+ "grunt-banana-checker": "0.6.0",
+ "grunt-eslint": "20.1.0",
"grunt-jsonlint": "1.1.0",
- "grunt-stylelint": "0.7.0",
+ "grunt-stylelint": "0.8.0",
"stylelint": "7.8.0",
"stylelint-config-wikimedia": "0.4.1"
}
--
To view, visit https://gerrit.wikimedia.org/r/386429
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3b2f56c868f29b1ab445802b5be521f65638ff38
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/3D
Gerrit-Branch: master
Gerrit-Owner: Jforrester
Gerrit-Reviewer: Esanders
Gerrit-Reviewer: Legoktm
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...QuickSurveys[master]: build: Bump various devDependencies to latest
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/386432 )
Change subject: build: Bump various devDependencies to latest
..
build: Bump various devDependencies to latest
eslint ^3.19.0 →4.9.0
eslint-config-wikimedia ^0.4.0 →0.5.0
grunt-banana-checker 0.4.0 →0.6.0
grunt-eslint ^19.0.0 → 20.1.0
grunt-jsonlint 1.0.7 →1.1.0
grunt-stylelint0.6.0 →0.8.0
Change-Id: I750b1df23b671a28f27b28eba4044b4182ff998d
---
M package.json
1 file changed, 6 insertions(+), 6 deletions(-)
Approvals:
Esanders: Looks good to me, approved
jenkins-bot: Verified
diff --git a/package.json b/package.json
index decd1fb..d2d057f 100644
--- a/package.json
+++ b/package.json
@@ -4,13 +4,13 @@
"test": "grunt test"
},
"devDependencies": {
-"eslint": "^3.19.0",
-"eslint-config-wikimedia": "^0.4.0",
+"eslint": "4.9.0",
+"eslint-config-wikimedia": "0.5.0",
"grunt": "1.0.1",
-"grunt-banana-checker": "0.4.0",
-"grunt-eslint": "^19.0.0",
-"grunt-jsonlint": "1.0.7",
-"grunt-stylelint": "0.6.0",
+"grunt-banana-checker": "0.6.0",
+"grunt-eslint": "20.1.0",
+"grunt-jsonlint": "1.1.0",
+"grunt-stylelint": "0.8.0",
"stylelint": "7.8.0",
"stylelint-config-wikimedia": "0.4.1"
}
--
To view, visit https://gerrit.wikimedia.org/r/386432
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I750b1df23b671a28f27b28eba4044b4182ff998d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/QuickSurveys
Gerrit-Branch: master
Gerrit-Owner: Jforrester
Gerrit-Reviewer: Esanders
Gerrit-Reviewer: Legoktm
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...CodeEditor[master]: build: Bump various devDependencies to latest
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/386431 )
Change subject: build: Bump various devDependencies to latest
..
build: Bump various devDependencies to latest
eslint-config-wikimedia 0.4.0 → 0.5.0
grunt-banana-checker 0.5.0 → 0.6.0
grunt-eslint 19.0.0 → 20.1.0
grunt-stylelint 0.6.0 → 0.8.0
Change-Id: Ia01949112243c5a496896c0a3a5eda261e0f66bd
---
M modules/jquery.codeEditor.js
M package.json
2 files changed, 18 insertions(+), 18 deletions(-)
Approvals:
Esanders: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/jquery.codeEditor.js b/modules/jquery.codeEditor.js
index 91cfe16..ba4058e 100644
--- a/modules/jquery.codeEditor.js
+++ b/modules/jquery.codeEditor.js
@@ -330,20 +330,20 @@
api.abort();
api.saveOption( 'usecodeeditor', prefValue ? 1
: 0 )
- .fail( function ( code, result ) {
- var message;
+ .fail( function ( code, result ) {
+ var message;
- if ( code === 'http' &&
result.textStatus === 'abort' ) {
- // Request was aborted. Ignore
error
- return;
- }
+ if ( code === 'http' &&
result.textStatus === 'abort' ) {
+ // Request was aborted.
Ignore error
+ return;
+ }
- message = 'Failed to set code editor
preference: ' + code;
- if ( result.error && result.error.info
) {
- message += '\n' +
result.error.info;
- }
- mw.log.warn( message );
- } );
+ message = 'Failed to set code
editor preference: ' + code;
+ if ( result.error &&
result.error.info ) {
+ message += '\n' +
result.error.info;
+ }
+ mw.log.warn( message );
+ } );
},
/**
* Sets up the iframe in place of the textarea to allow
more advanced operations
@@ -381,9 +381,9 @@
box.textSelection( 'register',
textSelectionFn );
// Disable some annoying commands
-
context.codeEditor.commands.removeCommand( 'replace' ); // ctrl+R
+
context.codeEditor.commands.removeCommand( 'replace' ); // ctrl+R
context.codeEditor.commands.removeCommand( 'transposeletters' ); // ctrl+T
-
context.codeEditor.commands.removeCommand( 'gotoline' ); // ctrl+L
+
context.codeEditor.commands.removeCommand( 'gotoline' ); // ctrl+L
context.codeEditor.setReadOnly(
box.prop( 'readonly' ) );
context.codeEditor.setShowInvisibles(
context.showInvisibleChars );
diff --git a/package.json b/package.json
index 0e4e1ab..1f0d3cd 100644
--- a/package.json
+++ b/package.json
@@ -7,12 +7,12 @@
"test": "grunt test"
},
"devDependencies": {
-"eslint-config-wikimedia": "0.4.0",
+"eslint-config-wikimedia": "0.5.0",
"grunt": "1.0.1",
-"grunt-banana-checker": "0.5.0",
-"grunt-eslint": "19.0.0",
+"grunt-banana-checker": "0.6.0",
+"grunt-eslint": "20.1.0",
"grunt-jsonlint": "1.1.0",
-"grunt-stylelint": "0.6.0",
+"grunt-stylelint": "0.8.0",
"stylelint": "7.8.0",
"stylelint-config-wikimedia": "0.4.1"
}
--
To view, visit https://gerrit.wikimedia.org/r/386431
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia01949112243c5a496896c0a3a5eda261e0f66bd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CodeEditor
Gerrit-Branch: master
Gerrit-Owner: Jforrester
Gerrit-Reviewer: Esanders
Gerrit-Reviewer: Legoktm
Gerrit-Reviewer: TheDJ
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commi
[MediaWiki-commits] [Gerrit] mediawiki...BetaFeatures[master]: build: Bump various devDependencies to latest
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/386430 )
Change subject: build: Bump various devDependencies to latest
..
build: Bump various devDependencies to latest
eslint-config-wikimedia 0.4.0 → 0.5.0
grunt-banana-checker 0.5.0 → 0.6.0
grunt-eslint 19.0.0 → 20.1.0
grunt-jsonlint1.0.8 → 1.1.0
grunt-stylelint 0.6.0 → 0.9.0
stylelint 7.8.0 → 8.2.0
Change-Id: Ic80c765108feed6b6671ab2dc9bd90e7f743aa60
---
M package.json
1 file changed, 5 insertions(+), 5 deletions(-)
Approvals:
Esanders: Looks good to me, approved
jenkins-bot: Verified
diff --git a/package.json b/package.json
index e86c99e..9bb6427 100644
--- a/package.json
+++ b/package.json
@@ -7,13 +7,13 @@
"test": "grunt test"
},
"devDependencies": {
-"eslint-config-wikimedia": "0.4.0",
+"eslint-config-wikimedia": "0.5.0",
"grunt": "1.0.1",
-"grunt-banana-checker": "0.5.0",
+"grunt-banana-checker": "0.6.0",
"grunt-contrib-watch": "1.0.0",
-"grunt-eslint": "19.0.0",
-"grunt-jsonlint": "1.0.8",
-"grunt-stylelint": "0.6.0",
+"grunt-eslint": "20.1.0",
+"grunt-jsonlint": "1.1.0",
+"grunt-stylelint": "0.8.0",
"stylelint": "7.8.0",
"stylelint-config-wikimedia": "0.4.1"
}
--
To view, visit https://gerrit.wikimedia.org/r/386430
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic80c765108feed6b6671ab2dc9bd90e7f743aa60
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BetaFeatures
Gerrit-Branch: master
Gerrit-Owner: Jforrester
Gerrit-Reviewer: Esanders
Gerrit-Reviewer: Legoktm
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: LinearEnterKeyDownHandler: Enter behavior in nested lists
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/386418 )
Change subject: LinearEnterKeyDownHandler: Enter behavior in nested lists
..
LinearEnterKeyDownHandler: Enter behavior in nested lists
Bug: T108595
Change-Id: Ie78addc64db977f84553705b18dcc98e58d5c352
---
M src/ce/keydownhandlers/ve.ce.LinearEnterKeyDownHandler.js
M tests/ce/ve.ce.Surface.test.js
2 files changed, 54 insertions(+), 5 deletions(-)
Approvals:
Esanders: Looks good to me, approved
jenkins-bot: Verified
Jforrester: Looks good to me, but someone else must approve
diff --git a/src/ce/keydownhandlers/ve.ce.LinearEnterKeyDownHandler.js
b/src/ce/keydownhandlers/ve.ce.LinearEnterKeyDownHandler.js
index 7d05f16..c22ce2a 100644
--- a/src/ce/keydownhandlers/ve.ce.LinearEnterKeyDownHandler.js
+++ b/src/ce/keydownhandlers/ve.ce.LinearEnterKeyDownHandler.js
@@ -35,12 +35,13 @@
* @inheritdoc
*/
ve.ce.LinearEnterKeyDownHandler.static.execute = function ( surface, e ) {
- var txRemove, txInsert, outerParent, outerChildrenCount, list,
prevContentOffset,
+ var txRemove, txInsert, outerParent, outerChildrenCount, list,
listParent, prevContentOffset,
insertEmptyParagraph, node, focusedNode,
range = surface.model.getSelection().getRange(),
cursor = range.from,
documentModel = surface.model.getDocument(),
emptyParagraph = [ { type: 'paragraph' }, { type: '/paragraph'
} ],
+ emptyListItem = [ { type: 'listItem' }, { type: 'paragraph' },
{ type: '/paragraph' }, { type: '/listItem' } ],
advanceCursor = true,
stack = [],
outermostNode = null,
@@ -179,6 +180,8 @@
) {
// Enter was pressed in an empty list item.
list = outermostNode.getModel().getParent();
+ listParent = list.getParent();
+ advanceCursor = false;
if ( list.getChildren().length === 1 ) {
// The list item we're about to remove is the
only child of the list
// Remove the list
@@ -190,14 +193,32 @@
txInsert =
ve.dm.TransactionBuilder.static.newFromRemoval(
documentModel,
outermostNode.getModel().getOuterRange()
);
+ }
+
+ if (
+ // The removed item was in a nested list node
+ listParent.type === 'listItem' &&
+ // This was the last item in the nested list
+ listParent.getChildren()[
listParent.getChildren().length - 1 ] === list
+ ) {
surface.model.change( txInsert );
range = txInsert.translateRange( range );
- // Insert a paragraph
+ // Add a new listItem to the parent list
+ txInsert =
ve.dm.TransactionBuilder.static.newFromInsertion(
+ documentModel,
listParent.getOuterRange().to, emptyListItem
+ );
+ // ...and push forward to be within it
+ advanceCursor = true;
+ } else if ( list.getChildren().length !== 1 ) {
+ // Otherwise, if we just removed a list item,
insert a paragraph
+
+ surface.model.change( txInsert );
+ range = txInsert.translateRange( range );
+
txInsert =
ve.dm.TransactionBuilder.static.newFromInsertion(
documentModel, list.getOuterRange().to,
emptyParagraph
);
}
- advanceCursor = false;
} else {
// We must process the transaction first because
getRelativeContentOffset can't help us yet
txInsert =
ve.dm.TransactionBuilder.static.newFromInsertion( documentModel, range.from,
stack );
diff --git a/tests/ce/ve.ce.Surface.test.js b/tests/ce/ve.ce.Surface.test.js
index c224f5f..c4fcc16 100644
--- a/tests/ce/ve.ce.Surface.test.js
+++ b/tests/ce/ve.ce.Surface.test.js
@@ -1014,17 +1014,32 @@
msg: 'List item not split by shift+enter'
},
{
+ rangeOrSelection: new ve.Range( 30 ),
+ keys: [ 'ENTER', 'ENTER' ],
+ expectedData: function ( data ) {
+
[MediaWiki-commits] [Gerrit] mediawiki...EventBus[master]: Improved logging for JobExecutor
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/386599 )
Change subject: Improved logging for JobExecutor
..
Improved logging for JobExecutor
Change-Id: If2a27d3c98bfa30b3f197151d13a4348e7eadc3e
---
M JobExecutor.php
1 file changed, 42 insertions(+), 8 deletions(-)
Approvals:
Mobrovac: Looks good to me, approved
jenkins-bot: Verified
diff --git a/JobExecutor.php b/JobExecutor.php
index b649c63..b0d869f 100644
--- a/JobExecutor.php
+++ b/JobExecutor.php
@@ -24,7 +24,12 @@
$jobCreateResult = $this->getJobFromParams( $jobEvent );
if ( !$jobCreateResult['status'] ) {
- $this->logger()->error( $jobCreateResult['message'] );
+ $this->logger()->error( 'Failed creating job from
description',
+ [
+ 'job_type' => $jobEvent['type'],
+ 'message' =>
$jobCreateResult['message']
+ ]
+ );
return $jobCreateResult;
}
@@ -39,11 +44,30 @@
$lbFactory->beginMasterChanges( $fnameTrxOwner );
$status = $job->run();
- $message = $job->getLastError();
$lbFactory->commitMasterChanges( $fnameTrxOwner );
- if ( !$status ) {
- $this->logger()->error( $job->toString() . "
error={$message}" );
+ if ( $status === false ) {
+ $message = $job->getLastError();
+ $this->logger()->error( 'Failed executing job:
' . $job->toString(),
+ [
+ 'job_type' => $job->getType(),
+ 'error'=> $message
+ ]
+ );
+ } elseif ( !is_bool( $status ) ) {
+ $message = 'Success, but no status returned';
+ $this->logger()->warning( 'Non-boolean result
returned by job: ' . $job->toString(),
+ [
+ 'job_type' => $job->getType(),
+ 'job_result' => isset( $status
) ? $status : 'unset'
+ ]
+ );
+ // For backwards compatibility with old job
executor we should set the status
+ // to true here, as before anything other then
boolean false was considered a success.
+ // TODO: After all the jobs are fixed to return
proper result this should be removed.
+ $status = true;
+ } else {
+ $message = 'success';
}
// Important: this must be the last deferred update
added (T100085, T154425)
@@ -53,20 +77,30 @@
} catch ( Exception $e ) {
MWExceptionHandler::rollbackMasterChangesAndLog( $e );
$status = false;
- $message = 'Error executing job: '
+ $message = 'Exception executing job: '
. $job->toString() . ' : '
. get_class( $e ) . ': ' .
$e->getMessage();
- $this->logger()->error( $message );
+ $this->logger()->error( $message,
+ [
+ 'job_type' => $job->getType(),
+ 'exception' => $e
+ ]
+ );
}
// Always attempt to call teardown() even if Job throws
exception.
try {
$job->teardown( $status );
} catch ( Exception $e ) {
- $message = 'Error tearing down job: '
+ $message = 'Exception tearing down job: '
. $job->toString() . ' : '
. get_class( $e ) . ': ' .
$e->getMessage();
- $this->logger()->error( $message );
+ $this->logger()->error( $message,
+ [
+ 'job_type' => $job->getType(),
+ 'exception' => $e
+ ]
+ );
}
// The JobRunn
[MediaWiki-commits] [Gerrit] mediawiki...CirrusSearch[master]: [cleanup] Remove wgCirrusSearchBoostLinks
DCausse has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/386605 ) Change subject: [cleanup] Remove wgCirrusSearchBoostLinks .. [cleanup] Remove wgCirrusSearchBoostLinks Use rescore profiles instead. Change-Id: Ia9f8df70c7ee39f847a94bbf96d5803dd98e468d --- M CirrusSearch.php M README M docs/settings.txt M includes/Api/ConfigDump.php M includes/Hooks.php M includes/Query/PrefixSearchQueryBuilder.php M includes/Search/RescoreBuilders.php M includes/Search/SearchContext.php M includes/UserTesting.php M profiles/RescoreProfiles.config.php M tests/unit/RescoreBuilderTest.php M tests/unit/UserTestingTest.php 12 files changed, 23 insertions(+), 77 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CirrusSearch refs/changes/05/386605/1 diff --git a/CirrusSearch.php b/CirrusSearch.php index 5f4644a..bf53382 100644 --- a/CirrusSearch.php +++ b/CirrusSearch.php @@ -781,12 +781,6 @@ $wgCirrusSearchFragmentSize = 150; /** - * Whether to boost searches based on link counts. Default is true - * which most wikis will want. Edge cases will want to turn this off. - */ -$wgCirrusSearchBoostLinks = true; - -/** * Shard allocation settings. The include/exclude/require top level keys are * the type of rule to use, the names should be self explanatory. The values * are an array of keys and values of different rules to apply to an index. diff --git a/README b/README index 24f85ce..9451816 100644 --- a/README +++ b/README @@ -6,6 +6,13 @@ Get Elasticsearch up and running somewhere. Elasticsearch v5.x is only supported but 5.3.1 or higher is recommended. +CONFIG CHANGES +-- + +- 1.31 + - The config var wgCirrusSearchBoostLinks has been removed, to disable link boosting +set $wgCirrusSearchRescoreProfile = 'classic_noboostlinks' + KNOWN ISSUES All elastic versions prior to 5.3.1 have bugs that affect CirrusSearch: diff --git a/docs/settings.txt b/docs/settings.txt index ad6494f..ec7db6e 100644 --- a/docs/settings.txt +++ b/docs/settings.txt @@ -922,14 +922,6 @@ Number of characters to include in article fragments. -; $wgCirrusSearchBoostLinks - -Default: -$wgCirrusSearchBoostLinks = true; - -Whether to boost searches based on link counts. Default is true -which most wikis will want. Edge cases will want to turn this off. - ; $wgCirrusSearchIndexAllocation Default: diff --git a/includes/Api/ConfigDump.php b/includes/Api/ConfigDump.php index 06d6fbd..c79fb84 100644 --- a/includes/Api/ConfigDump.php +++ b/includes/Api/ConfigDump.php @@ -65,7 +65,6 @@ 'CirrusSearchFragmentSize', 'CirrusSearchMainPageCacheWarmer', 'CirrusSearchCacheWarmers', - 'CirrusSearchBoostLinks', 'CirrusSearchIndexAllocation', 'CirrusSearchFullTextQueryBuilderProfile', 'CirrusSearchRescoreProfile', diff --git a/includes/Hooks.php b/includes/Hooks.php index 2376275..44cbc9d 100644 --- a/includes/Hooks.php +++ b/includes/Hooks.php @@ -87,7 +87,6 @@ $wgCirrusSearchPhraseRescoreWindowSize, $wgCirrusSearchFunctionRescoreWindowSize, $wgCirrusSearchFragmentSize, - $wgCirrusSearchBoostLinks, $wgCirrusSearchAllFields, $wgCirrusSearchAllFieldsForRescore, $wgCirrusSearchPhraseRescoreBoost, @@ -116,7 +115,6 @@ self::overrideNumeric( $wgCirrusSearchPhraseSlop[ 'boost' ], $request, 'cirrusPhraseSlop', 10 ); self::overrideNumeric( $wgCirrusSearchFunctionRescoreWindowSize, $request, 'cirrusFunctionWindow', 1 ); self::overrideNumeric( $wgCirrusSearchFragmentSize, $request, 'cirrusFragmentSize', 1000 ); - self::overrideYesNo( $wgCirrusSearchBoostLinks, $request, 'cirrusBoostLinks' ); self::overrideYesNo( $wgCirrusSearchAllFields[ 'use' ], $request, 'cirrusUseAllFields' ); self::overrideYesNo( $wgCirrusSearchAllFieldsForRescore, $request, 'cirrusUseAllFieldsForRescore' ); self::overrideUseExtraPluginForRegex( $request ); diff --git a/includes/Query/PrefixSearchQueryBuilder.php b/includes/Query/PrefixSearchQueryBuilder.php index 1b0f9d4..a41cb3c 100644 --- a/includes/Query/PrefixSearchQueryBuilder.php +++ b/includes/Query/PrefixSearchQueryBuilder.php @@ -74,8 +74,5 @@ $searchContext->setMainQuery( $query ); } } - - /** @suppress PhanDeprecatedFunction */ - $searchContext->setBoostLinks( true ); } } diff --git a/includes/Search/RescoreBuilders.php b/includes/Search/RescoreBuilders.php index 12d4054..76a4fac 100644 --- a/includes/Search/RescoreBuilde
[MediaWiki-commits] [Gerrit] operations/puppet[production]: install_server: Reimage db2086 with stretch
Marostegui has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/386606 )
Change subject: install_server: Reimage db2086 with stretch
..
install_server: Reimage db2086 with stretch
Bug: T178359
Change-Id: I8483ac1fb84c77ba8857ff17c4f1067708b947c7
---
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
1 file changed, 2 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/06/386606/1
diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
index ca3b7ff..f35b328 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -1656,6 +1656,8 @@
host db2086 {
hardware ethernet 18:66:DA:F8:F5:80;
fixed-address db2086.codfw.wmnet;
+option pxelinux.pathprefix "stretch-installer/";
+filename "stretch-installer/debian-installer/amd64/pxelinux.0";
}
host db2087 {
--
To view, visit https://gerrit.wikimedia.org/r/386606
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8483ac1fb84c77ba8857ff17c4f1067708b947c7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Marostegui
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-codfw.php: Add db2088 and db2084 to the config
Marostegui has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/386607 ) Change subject: db-codfw.php: Add db2088 and db2084 to the config .. db-codfw.php: Add db2088 and db2084 to the config Just adding db2084 and db2088 lines to their future shards, commented. To have a clear picture of how it will look like Bug: T178359 Change-Id: I1c39ef85c06c5543873c4c1e686f576e45a5860d --- M wmf-config/db-codfw.php 1 file changed, 6 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/07/386607/1 diff --git a/wmf-config/db-codfw.php b/wmf-config/db-codfw.php index 089dd33..9cbdc63 100644 --- a/wmf-config/db-codfw.php +++ b/wmf-config/db-codfw.php @@ -111,6 +111,7 @@ 'db2070' => 400, # C5 3.3TB 160GB 'db2071' => 50, # A6 3.6TB 512GB, api 'db2072' => 500, # B6 3.6TB 512GB, # mariadb 10.1 + # 'db2088' => 400, # D1 3.3TB 512GB # rc, log: s1 and s2 ], 's2' => [ 'db2017' => 0, # B6 2.9TB 96GB, master @@ -120,6 +121,7 @@ 'db2056' => 50, # D6 3.3TB 160GB, dump (inactive), vslow #innodb compressed 'db2063' => 100, # D6 3.3TB 160GB, api 'db2064' => 400, # D6 3.3TB 160GB + # 'db2088' => 400, # D1 3.3TB 512GB # rc, log: s1 and s2 ], /* s3 */ 'DEFAULT' => [ 'db2018' => 0, # B6 2.9TB 96GB, master @@ -137,6 +139,7 @@ 'db2058' => 50, # D6 3.3TB 160GB, dump (inactive), vslow 'db2065' => 200, # D6 3.3TB 160GB, api 'db2073' => 400, # C6 3.3TB 512GB # Compressed InnoDB + # 'db2084' => 400, # D6 3.3TB 512GB # rc, log: s4 and s5 ], 's5' => [ 'db2023' => 0, # B6 2.9TB 96GB, master @@ -151,8 +154,8 @@ # 'db2081' => 400, # A6 3.3TB 512GB # Compressed InnoDB #T170662 # 'db2082' => 400, # B6 3.3TB 512GB # Compressed InnoDB #T170662 # 'db2083' => 400, # C6 3.3TB 512GB # Compressed InnoDB #T170662 - # 'db2084' => 400, # D6 3.3TB 512GB # Compressed InnoDB #T170662 - # 'db2086' => 400, # B1 3.3TB 512GB # Compressed InnoDB #T170662 + # 'db2084' => 400, # D6 3.3TB 512GB # rc, log: s4 and s5 + # 'db2086' => 400, # B1 3.3TB 512GB # rc, log: s5 and s7 ], 's6' => [ 'db2028' => 0, # B6 2.9TB 96GB, master @@ -171,6 +174,7 @@ 'db2061' => 200, # D6 3.3TB 160GB, api 'db2068' => 300, # D6 3.3TB 160GB 'db2077' => 400, # C1 3.3TB 512GB + # 'db2086' => 400, # B1 3.3TB 512GB # rc, log: s5 and s7 ], 'silver' => [ 'silver' => 1, -- To view, visit https://gerrit.wikimedia.org/r/386607 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1c39ef85c06c5543873c4c1e686f576e45a5860d Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Marostegui ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: install_server: Reimage db2086 with stretch
Marostegui has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/386606 )
Change subject: install_server: Reimage db2086 with stretch
..
install_server: Reimage db2086 with stretch
Bug: T178359
Change-Id: I8483ac1fb84c77ba8857ff17c4f1067708b947c7
---
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
1 file changed, 2 insertions(+), 0 deletions(-)
Approvals:
Marostegui: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
index ca3b7ff..f35b328 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -1656,6 +1656,8 @@
host db2086 {
hardware ethernet 18:66:DA:F8:F5:80;
fixed-address db2086.codfw.wmnet;
+option pxelinux.pathprefix "stretch-installer/";
+filename "stretch-installer/debian-installer/amd64/pxelinux.0";
}
host db2087 {
--
To view, visit https://gerrit.wikimedia.org/r/386606
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8483ac1fb84c77ba8857ff17c4f1067708b947c7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Marostegui
Gerrit-Reviewer: Jcrespo
Gerrit-Reviewer: Marostegui
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: logstash: explicit mappings for a few problematic fields
Gehel has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/386608 )
Change subject: logstash: explicit mappings for a few problematic fields
..
logstash: explicit mappings for a few problematic fields
The following fields have been causing trouble with dynamic mappings:
* limit
* line
* pid
* process
* severity
using explicit mappings should solve some of the conflicts we are seeing.
Bug: T179058
Change-Id: I4f2d8c72ffee13aa5a03e434977b10151400638a
---
M modules/role/files/logstash/elasticsearch-template.json
1 file changed, 22 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/08/386608/1
diff --git a/modules/role/files/logstash/elasticsearch-template.json
b/modules/role/files/logstash/elasticsearch-template.json
index eaffcc6..0cad77c 100644
--- a/modules/role/files/logstash/elasticsearch-template.json
+++ b/modules/role/files/logstash/elasticsearch-template.json
@@ -147,8 +147,28 @@
"doc_values": true
},
"response_size" : {
-"type" : "long",
-"doc_values": true
+ "type" : "long",
+ "doc_values": true
+},
+"limit" : {
+ "type" : "long",
+ "doc_values": true
+},
+"line" : {
+ "type" : "integer",
+ "doc_values": true
+},
+"pid" : {
+ "type" : "long",
+ "doc_values": true
+},
+"process" : {
+ "type" : "long",
+ "doc_values": true
+},
+"severity" : {
+ "type" : "integer",
+ "doc_values": true
}
}
}
--
To view, visit https://gerrit.wikimedia.org/r/386608
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4f2d8c72ffee13aa5a03e434977b10151400638a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Gehel
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...WikibaseLexeme[master]: Restore dummy demo data
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/384539 )
Change subject: Restore dummy demo data
..
Restore dummy demo data
This is basically restoring stuff removed in
Idd8b20fcca349a06f0fb18d92cf2608b113b163e.
Bug: T178045
Change-Id: I28e18a1c07135a2c85906d7ad2d09f460e0059c6
---
M src/Content/LexemeContent.php
M src/DataModel/Lexeme.php
A src/DemoData/AskOut1Populator.php
A src/DemoData/AskOut2Populator.php
A src/DemoData/AskOut3Populator.php
A src/DemoData/HardLexemePopulator.php
A src/DemoData/Id.php
A src/DemoData/LeiterLexemePopulator.php
M tests/browser/features/support/pages/lexeme_page.rb
9 files changed, 469 insertions(+), 1 deletion(-)
Approvals:
Ladsgroup: Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/Content/LexemeContent.php b/src/Content/LexemeContent.php
index 5e3e447..4fe5607 100644
--- a/src/Content/LexemeContent.php
+++ b/src/Content/LexemeContent.php
@@ -7,6 +7,12 @@
use Wikibase\Content\EntityHolder;
use Wikibase\EntityContent;
use Wikibase\Lexeme\DataModel\Lexeme;
+use Wikibase\Lexeme\DemoData\Id as DemoDataId;
+use Wikibase\Lexeme\DemoData\AskOut1Populator;
+use Wikibase\Lexeme\DemoData\AskOut2Populator;
+use Wikibase\Lexeme\DemoData\AskOut3Populator;
+use Wikibase\Lexeme\DemoData\HardLexemePopulator;
+use Wikibase\Lexeme\DemoData\LeiterLexemePopulator;
use Wikimedia\Assert\Assert;
/**
@@ -50,7 +56,24 @@
throw new LogicException( 'This content object is
empty!' );
}
- return $this->lexemeHolder->getEntity( Lexeme::class );
+ /** @var Lexeme $lexeme */
+ $lexeme = $this->lexemeHolder->getEntity( Lexeme::class );
+
+ // TODO: This is a test dummy that must be removed later
+ $id = $lexeme->getId()->getSerialization();
+ if ( $id === DemoDataId::L_HARD ) {
+ ( new HardLexemePopulator() )->populate( $lexeme );
+ } elseif ( $id === DemoDataId::L_LEITER ) {
+ ( new LeiterLexemePopulator() )->populate( $lexeme );
+ } elseif ( $id === DemoDataId::L_ASK_1 ) {
+ ( new AskOut1Populator() )->populate( $lexeme );
+ } elseif ( $id === DemoDataId::L_ASK_2 ) {
+ ( new AskOut2Populator() )->populate( $lexeme );
+ } elseif ( $id === DemoDataId::L_ASK_OUT ) {
+ ( new AskOut3Populator() )->populate( $lexeme );
+ }
+
+ return $lexeme;
}
/**
diff --git a/src/DataModel/Lexeme.php b/src/DataModel/Lexeme.php
index 90f766d..f0462ed 100644
--- a/src/DataModel/Lexeme.php
+++ b/src/DataModel/Lexeme.php
@@ -258,6 +258,15 @@
}
/**
+* @param Form[] $forms
+* @deprecated Temporary method, for demo. Just don't use.
+*/
+ public function setForms( array $forms ) {
+ $this->forms = new FormSet( $forms );
+ $this->nextFormId = $this->forms->maxFormIdNumber() + 1;
+ }
+
+ /**
* @return Sense[]
*/
public function getSenses() {
@@ -265,6 +274,14 @@
}
/**
+* @param Sense[] $senses
+* @deprecated Only for demonstration purposes. Do not use otherwise!
+*/
+ public function setSenses( array $senses ) {
+ $this->senses = $senses;
+ }
+
+ /**
* @return bool False if a non-optional field was never initialized,
true otherwise.
*/
public function isSufficientlyInitialized() {
diff --git a/src/DemoData/AskOut1Populator.php
b/src/DemoData/AskOut1Populator.php
new file mode 100644
index 000..6fa60fd
--- /dev/null
+++ b/src/DemoData/AskOut1Populator.php
@@ -0,0 +1,29 @@
+buildDefaultSense();
+
+ $lexeme->setForms( [] );
+ $lexeme->setSenses( [ $defaultSense ] );
+ }
+
+ /**
+* @return \Wikibase\Lexeme\DataModel\Sense
+*/
+ private function buildDefaultSense() {
+ return NewSense::havingId( 'S5' )
+ ->withGloss( 'en', '’To ask somebody out’: To request a
romantic date' )
+ ->build();
+ }
+
+}
diff --git a/src/DemoData/AskOut2Populator.php
b/src/DemoData/AskOut2Populator.php
new file mode 100644
index 000..bc551f7
--- /dev/null
+++ b/src/DemoData/AskOut2Populator.php
@@ -0,0 +1,35 @@
+buildDefaultSense();
+
+ $lexeme->setForms( [] );
+ $lexeme->setSenses( [ $defaultSense ] );
+ }
+
+ /**
+* @return \Wikibase\Lexeme\DataModel\Sense
+*/
+ private function buildDefaultSense() {
+ return NewSense::havingId( 'S5' )
+ ->withGloss( 'en', 'To request a romantic date' )
+ ->withStatement(
+
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-codfw.php: Add db2088 and db2084 to the config
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/386607 ) Change subject: db-codfw.php: Add db2088 and db2084 to the config .. db-codfw.php: Add db2088 and db2084 to the config Just adding db2084 and db2088 lines to their future shards, commented. To have a clear picture of how it will look like Bug: T178359 Change-Id: I1c39ef85c06c5543873c4c1e686f576e45a5860d --- M wmf-config/db-codfw.php 1 file changed, 6 insertions(+), 2 deletions(-) Approvals: Marostegui: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/db-codfw.php b/wmf-config/db-codfw.php index 089dd33..9cbdc63 100644 --- a/wmf-config/db-codfw.php +++ b/wmf-config/db-codfw.php @@ -111,6 +111,7 @@ 'db2070' => 400, # C5 3.3TB 160GB 'db2071' => 50, # A6 3.6TB 512GB, api 'db2072' => 500, # B6 3.6TB 512GB, # mariadb 10.1 + # 'db2088' => 400, # D1 3.3TB 512GB # rc, log: s1 and s2 ], 's2' => [ 'db2017' => 0, # B6 2.9TB 96GB, master @@ -120,6 +121,7 @@ 'db2056' => 50, # D6 3.3TB 160GB, dump (inactive), vslow #innodb compressed 'db2063' => 100, # D6 3.3TB 160GB, api 'db2064' => 400, # D6 3.3TB 160GB + # 'db2088' => 400, # D1 3.3TB 512GB # rc, log: s1 and s2 ], /* s3 */ 'DEFAULT' => [ 'db2018' => 0, # B6 2.9TB 96GB, master @@ -137,6 +139,7 @@ 'db2058' => 50, # D6 3.3TB 160GB, dump (inactive), vslow 'db2065' => 200, # D6 3.3TB 160GB, api 'db2073' => 400, # C6 3.3TB 512GB # Compressed InnoDB + # 'db2084' => 400, # D6 3.3TB 512GB # rc, log: s4 and s5 ], 's5' => [ 'db2023' => 0, # B6 2.9TB 96GB, master @@ -151,8 +154,8 @@ # 'db2081' => 400, # A6 3.3TB 512GB # Compressed InnoDB #T170662 # 'db2082' => 400, # B6 3.3TB 512GB # Compressed InnoDB #T170662 # 'db2083' => 400, # C6 3.3TB 512GB # Compressed InnoDB #T170662 - # 'db2084' => 400, # D6 3.3TB 512GB # Compressed InnoDB #T170662 - # 'db2086' => 400, # B1 3.3TB 512GB # Compressed InnoDB #T170662 + # 'db2084' => 400, # D6 3.3TB 512GB # rc, log: s4 and s5 + # 'db2086' => 400, # B1 3.3TB 512GB # rc, log: s5 and s7 ], 's6' => [ 'db2028' => 0, # B6 2.9TB 96GB, master @@ -171,6 +174,7 @@ 'db2061' => 200, # D6 3.3TB 160GB, api 'db2068' => 300, # D6 3.3TB 160GB 'db2077' => 400, # C1 3.3TB 512GB + # 'db2086' => 400, # B1 3.3TB 512GB # rc, log: s5 and s7 ], 'silver' => [ 'silver' => 1, -- To view, visit https://gerrit.wikimedia.org/r/386607 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1c39ef85c06c5543873c4c1e686f576e45a5860d Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Marostegui Gerrit-Reviewer: Jcrespo Gerrit-Reviewer: Marostegui Gerrit-Reviewer: Urbanecm Gerrit-Reviewer: Zoranzoki21 Gerrit-Reviewer: jenkins-bot <> ___ 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 "db-eqiad.php: Depool db1101"
Hello jenkins-bot, Jcrespo, I'd like you to do a code review. Please visit https://gerrit.wikimedia.org/r/386609 to review the following change. Change subject: Revert "db-eqiad.php: Depool db1101" .. Revert "db-eqiad.php: Depool db1101" This reverts commit 33cf1c71f83d12d770ecb2dfd119179fb7f7c7e5. Change-Id: I47b2213c6e7ddd9012876bc7c84aee6b7a627e59 --- M wmf-config/db-eqiad.php 1 file changed, 7 insertions(+), 7 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/09/386609/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 612add1..0bef7b9 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -118,8 +118,8 @@ 'db1060' => 1, # C2 2.8TB 96GB, api #master for sanitarium #T153743 'db1074' => 300, # A2 3.6TB 512GB, api 'db1076' => 500, # B1 3.6TB 512GB - 'db1090' => 1, # C3 3.6TB 512GB # temporary watchlist and rc - # 'db1101' => 1, # C2 3.6TB 512GB, watchlist, recentchanges, contributions, logpager, old master 2 #T174509 + 'db1090' => 500, # C3 3.6TB 512GB + 'db1101' => 1, # C2 3.6TB 512GB, watchlist, recentchanges, contributions, logpager, old master 2 ], /* s3 */ 'DEFAULT' => [ 'db1075' => 0, # A2 3.6TB 512GB, master @@ -289,19 +289,19 @@ 'db1074' => 1, ], 'watchlist' => [ - 'db1090' => 1, + 'db1101' => 1, ], 'recentchanges' => [ - 'db1090' => 1, + 'db1101' => 1, ], 'recentchangeslinked' => [ - 'db1090' => 1, + 'db1101' => 1, ], 'contributions' => [ - 'db1090' => 1, + 'db1101' => 1, ], 'logpager' => [ - 'db1090' => 1, + 'db1101' => 1, ], ], /* s3 */ 'DEFAULT' => [ -- To view, visit https://gerrit.wikimedia.org/r/386609 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I47b2213c6e7ddd9012876bc7c84aee6b7a627e59 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Marostegui Gerrit-Reviewer: Jcrespo Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikidata...gui[master]: Add helper functions related to options
Lucas Werkmeister (WMDE) has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/386610 )
Change subject: Add helper functions related to options
..
Add helper functions related to options
AbstractResultBrowser.getOption() returns a single option, falling back
to a provided default value if the option is not specified.
FormatterHelper.getColumnNamesOption() turns one or more variable names
into the corresponding column names. The variable names can be specified
as a single value or as an array, and should start with a question mark.
Example:
#defaultView:Map{"layer": "?partyLabel"}
Change-Id: I78cfb4d8d53806146e3c27cef8a6aec7e35f9291
---
M wikibase/queryService/ui/resultBrowser/AbstractResultBrowser.js
M wikibase/queryService/ui/resultBrowser/helper/FormatterHelper.js
2 files changed, 50 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/gui
refs/changes/10/386610/1
diff --git a/wikibase/queryService/ui/resultBrowser/AbstractResultBrowser.js
b/wikibase/queryService/ui/resultBrowser/AbstractResultBrowser.js
index cbd2faf..adba5cd 100644
--- a/wikibase/queryService/ui/resultBrowser/AbstractResultBrowser.js
+++ b/wikibase/queryService/ui/resultBrowser/AbstractResultBrowser.js
@@ -85,6 +85,29 @@
};
/**
+* Get a single option,
+* using a certain default value
+* if the option is not specified.
+*
+* @param {string} name The name of the option.
+* @param {*} defaultValue The default value to use if the option is
not specified.
+* This parameter is not optional – if the option may be absent,
+* explicitly pass undefined as the default value.
+* @return {*}
+*/
+ SELF.prototype.getOption = function( name, defaultValue ) {
+ if ( arguments.length !== 2 ) {
+ throw new Error( 'getOption must be called with exactly
two arguments' );
+ }
+
+ if ( name in this._options ) {
+ return this._options[ name ];
+ } else {
+ return defaultValue;
+ }
+ }
+
+ /**
* Sets the SPARQL API
*
* @param {wikibase.queryService.api.Sparql} sparqlApi
diff --git a/wikibase/queryService/ui/resultBrowser/helper/FormatterHelper.js
b/wikibase/queryService/ui/resultBrowser/helper/FormatterHelper.js
index 69fde1b..7605895 100644
--- a/wikibase/queryService/ui/resultBrowser/helper/FormatterHelper.js
+++ b/wikibase/queryService/ui/resultBrowser/helper/FormatterHelper.js
@@ -457,6 +457,33 @@
};
/**
+* Gets a list of column names from a result browser option
+* specifying one or more corresponding variable names.
+* (The variable names start with a question mark,
+* the returned column names don’t.)
+*
+* @param {string[]|string} optionValue
+* @return {string[]}
+*/
+ SELF.prototype.getColumnNamesOption = function( optionValue ) {
+ if ( ! Array.isArray( optionValue ) ) {
+ optionValue = [ optionValue ];
+ }
+ optionValue = optionValue.filter( function( variableName ) {
+ if ( ! variableName.startsWith( '?' ) ) {
+ window.console.warn(
+ 'column name ' + variableName + ' is
not a variable name, ignoring'
+ );
+ return false;
+ }
+ return true;
+ } );
+ return optionValue.map( function( variableName ) {
+ return variableName.substring( 1 );
+ } );
+ };
+
+ /**
* @see AbstractResultBrowser._i18n
*/
SELF.prototype._i18n = null;
--
To view, visit https://gerrit.wikimedia.org/r/386610
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I78cfb4d8d53806146e3c27cef8a6aec7e35f9291
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/gui
Gerrit-Branch: master
Gerrit-Owner: Lucas Werkmeister (WMDE)
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Fix interwiki sort order for Northern Sami
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/386324 ) Change subject: Fix interwiki sort order for Northern Sami .. Fix interwiki sort order for Northern Sami Since the native language name for Northern Sami was changed from "Sámegiella" to "Davvisámegiella" in T156589, the interwiki sort order should also be updated to reflect this. Bug: T178965 Change-Id: Idea9c545b475e097b3ae8f16066bed4d7a71fde2 --- M wmf-config/InterwikiSortOrders.php 1 file changed, 8 insertions(+), 8 deletions(-) Approvals: Zfilipin: Looks good to me, approved jenkins-bot: Verified Dereckson: Looks good to me, but someone else must approve diff --git a/wmf-config/InterwikiSortOrders.php b/wmf-config/InterwikiSortOrders.php index e5df248..9153fd0 100644 --- a/wmf-config/InterwikiSortOrders.php +++ b/wmf-config/InterwikiSortOrders.php @@ -6,7 +6,7 @@ 'roa-rup', 'frp', 'as', 'ast', 'atj', 'gn', 'av', 'ay', 'az', 'azb', 'bm', 'bn', 'bjn', 'zh-min-nan', 'nan', 'map-bms', 'ba', 'be', 'be-x-old', 'bh', 'bcl', 'bi', 'bg', 'bar', 'bo', 'bs', 'br', 'bxr', 'ca', 'cv', 'ceb', 'cs', 'ch', - 'cbk-zam', 'ny', 'sn', 'tum', 'cho', 'co', 'cy', 'da', 'dk', 'pdc', 'de', + 'cbk-zam', 'ny', 'sn', 'tum', 'cho', 'co', 'cy', 'da', 'dk', 'se', 'pdc', 'de', 'dv', 'nv', 'dsb', 'dz', 'mh', 'et', 'el', 'eml', 'en', 'myv', 'es', 'eo', 'ext', 'eu', 'ee', 'fa', 'hif', 'fo', 'fr', 'fy', 'ff', 'fur', 'ga', 'gv', 'gag', 'gd', 'gl', 'gan', 'ki', 'glk', 'gu', 'got', 'gom', 'hak', 'xal', 'ko', @@ -21,7 +21,7 @@ 'mhr', 'or', 'om', 'ng', 'hz', 'uz', 'pa', 'pi', 'pfl', 'pag', 'pnb', 'pap', 'ps', 'jam', 'koi', 'km', 'pcd', 'pms', 'tpi', 'nds', 'pl', 'tokipona', 'tp', 'pnt', 'pt', 'aa', 'kaa', 'crh', 'ty', 'ksh', 'ro', 'rmy', 'rm', 'qu', 'rue', 'ru', 'sah', - 'se', 'sm', 'sa', 'sg', 'sc', 'sco', 'stq', 'st', 'nso', 'tn', 'sq', 'scn', + 'sm', 'sa', 'sg', 'sc', 'sco', 'stq', 'st', 'nso', 'tn', 'sq', 'scn', 'si', 'simple', 'sd', 'ss', 'sk', 'sl', 'cu', 'szl', 'so', 'ckb', 'srn', 'sr', 'sh', 'su', 'fi', 'sv', 'tl', 'ta', 'shi', 'kab', 'roa-tara', 'tt', 'te', 'tet', 'th', 'ti', 'tg', 'to', 'chr', 'chy', 've', 'tcy', 'tr', 'tk', 'tw', 'tyv', 'din', 'udm', 'bug', @@ -34,7 +34,7 @@ 'frp', 'as', 'ast', 'atj', 'gn', 'av', 'ay', 'az', 'azb', 'bjn', 'id', 'ms', 'bm', 'bn', 'zh-min-nan', 'nan', 'map-bms', 'jv', 'su', 'ba', 'min', 'be', 'be-x-old', 'bh', 'bcl', 'bi', 'bar', 'bo', 'bs', 'br', 'bug', 'bg', 'bxr', 'ca', 'ceb', 'cv', 'cs', - 'ch', 'cbk-zam', 'ny', 'sn', 'tum', 'cho', 'co', 'cy', 'da', 'dk', 'pdc', 'de', + 'ch', 'cbk-zam', 'ny', 'sn', 'tum', 'cho', 'co', 'cy', 'da', 'dk', 'se', 'pdc', 'de', 'dv', 'nv', 'dsb', 'na', 'dz', 'mh', 'et', 'el', 'eml', 'en', 'myv', 'es', 'eo', 'ext', 'eu', 'ee', 'fa', 'hif', 'fo', 'fr', 'fy', 'ff', 'fur', 'ga', 'gv', 'sm', 'gag', 'gd', 'gl', 'gan', 'ki', 'glk', 'gu', 'got', 'gom', 'hak', 'xal', 'ko', @@ -48,7 +48,7 @@ 'nb', 'nn', 'nrm', 'nov', 'ii', 'oc', 'mhr', 'or', 'om', 'ng', 'hz', 'uz', 'pa', 'pi', 'pfl', 'pag', 'pnb', 'pap', 'ps', 'jam', 'km', 'pcd', 'pms', 'nds', 'pl', 'pnt', 'pt', 'aa', 'kaa', 'crh', 'ty', 'ksh', 'ro', 'rmy', 'rm', 'qu', 'ru', 'rue', 'sah', - 'se', 'sa', 'sg', 'sc', 'sco', 'stq', 'st', 'nso', 'tn', 'sq', 'scn', 'si', + 'sa', 'sg', 'sc', 'sco', 'stq', 'st', 'nso', 'tn', 'sq', 'scn', 'si', 'simple', 'sd', 'ss', 'sk', 'sl', 'cu', 'szl', 'so', 'ckb', 'srn', 'sr', 'sh', 'fi', 'sv', 'tl', 'ta', 'shi', 'kab', 'roa-tara', 'tt', 'te', 'tet', 'din', 'th', 'vi', 'ti', 'tg', 'tpi', 'tokipona', 'tp', 'chr', 'chy', 've', 'tcy', 'tr', 'tk', 'tw', @@ -62,7 +62,7 @@ 'ms', 'bg', 'bm', 'zh-min-nan', 'nan', 'map-bms', 'jv', 'su', 'ba', 'be', 'be-x-old', 'bh', 'bcl', 'bi', 'bn', 'bo', 'bar', 'bs', 'bpy', 'br', 'bug', 'bxr', 'ca', 'ceb', 'ch', 'cbk-zam', 'sn', 'tum', 'ny', 'cho', 'chr', 'co', - 'cy', 'cv', 'cs', 'da', 'dk', 'pdc', 'de', 'nv', 'dsb', 'na', 'dv', 'dz', + 'cy', 'cv', 'cs', 'da', 'dk', 'se', 'pdc', 'de', 'nv', 'dsb', 'na', 'dv', 'dz', 'mh', 'et', 'el', 'eml', 'en', 'myv', 'es', 'eo', 'ext', 'eu', 'ee', 'fa', 'hif', 'fo', 'fr', 'fy', 'ff', 'fur', 'ga', 'gv', 'sm', 'gag', 'gd', 'gl', 'gan', 'ki', 'glk', 'got', 'gom', 'gu', 'ha', 'hak', 'xal', 'haw', 'he', @@ -76,7 +76,7 @@ 'frr', 'pih', 'no', 'nb', 'nn', 'nrm', 'nov', 'oc', 'mhr', 'or', 'om', 'ng'
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Enable signature button in Projekt namespace on sewikimedia
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/386567 ) Change subject: Enable signature button in Projekt namespace on sewikimedia .. Enable signature button in Projekt namespace on sewikimedia Bug: T175363 Change-Id: Id8d09474e5a38bee787ea8152d395815cb9f723d --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Zfilipin: Looks good to me, approved jenkins-bot: Verified Dereckson: Looks good to me, but someone else must approve diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 45dd5a3..93cf6a7 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -12030,6 +12030,7 @@ '+plwiki' => [ NS_USER, 100, 102 ], // T133978; 100 -> Portal, 102 -> Wikiproject '+ruwiki' => [ 104 ], // T125509 '+ruwikinews' => [ 102 ], // T132241 - Комментарии + '+sewikimedia' => [ 100 ], // T175363 - Projekt '+trwiki' => [ 102 ], // T166522 - Vikiproje ], -- To view, visit https://gerrit.wikimedia.org/r/386567 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id8d09474e5a38bee787ea8152d395815cb9f723d Gerrit-PatchSet: 3 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Jon Harald Søby Gerrit-Reviewer: Dereckson Gerrit-Reviewer: Urbanecm Gerrit-Reviewer: Zfilipin Gerrit-Reviewer: Zoranzoki21 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...TwoColConflict[master]: Deactivate page specific edit notices on conflict simulation...
WMDE-Fisch has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/386611 )
Change subject: Deactivate page specific edit notices on conflict simulation
page
..
Deactivate page specific edit notices on conflict simulation page
Bug: T177382
Change-Id: If75dab840af034edf5e9366944a1b71f1d5d097d
---
M includes/SpecialConflictTestPage/TwoColConflictTestPage.php
1 file changed, 6 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TwoColConflict
refs/changes/11/386611/1
diff --git a/includes/SpecialConflictTestPage/TwoColConflictTestPage.php
b/includes/SpecialConflictTestPage/TwoColConflictTestPage.php
index a2b75de..5506403 100644
--- a/includes/SpecialConflictTestPage/TwoColConflictTestPage.php
+++ b/includes/SpecialConflictTestPage/TwoColConflictTestPage.php
@@ -33,6 +33,12 @@
}
/**
+* Do not add the page specific edit notices on the simulated conflict
view
+*/
+ protected function addEditNotices() {
+ }
+
+ /**
* Attempt submission - is overwritten in case of a test conflict to
avoid any real save
* this will also avoid running the hook that triggers logging a
resolved conflict
* @param array|bool &$resultDetails See docs for $result in
internalAttemptSave
--
To view, visit https://gerrit.wikimedia.org/r/386611
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If75dab840af034edf5e9366944a1b71f1d5d097d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TwoColConflict
Gerrit-Branch: master
Gerrit-Owner: WMDE-Fisch
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Add property for RDF mapping of external identifiers for Wik...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/386594 )
Change subject: Add property for RDF mapping of external identifiers for
Wikidata
..
Add property for RDF mapping of external identifiers for Wikidata
Bug: T178180
Change-Id: I5991f3f5d27acc63c4a08fe1ed91bd2f1ab0b1d9
---
M wmf-config/Wikibase.php
1 file changed, 3 insertions(+), 0 deletions(-)
Approvals:
Zfilipin: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wmf-config/Wikibase.php b/wmf-config/Wikibase.php
index 1478ee7..a32de27 100644
--- a/wmf-config/Wikibase.php
+++ b/wmf-config/Wikibase.php
@@ -143,6 +143,9 @@
$wgWBRepoSettings['dispatchingLockManager'] = 'redisLockManager';
// Cirrus usage for wbsearchentities is on
$wgWBRepoSettings['entitySearch']['useCirrus'] = true;
+
+ // T178180
+ $wgWBRepoSettings['canonicalUriProperty'] = 'P1921';
}
if ( $wmgUseWikibaseClient ) {
--
To view, visit https://gerrit.wikimedia.org/r/386594
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5991f3f5d27acc63c4a08fe1ed91bd2f1ab0b1d9
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Ladsgroup
Gerrit-Reviewer: Aude
Gerrit-Reviewer: Hoo man
Gerrit-Reviewer: Urbanecm
Gerrit-Reviewer: Zfilipin
Gerrit-Reviewer: Zoranzoki21
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: openstack: refactor deployment specific puppetmaster code
Rush has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/386612 )
Change subject: openstack: refactor deployment specific puppetmaster code
..
openstack: refactor deployment specific puppetmaster code
Bug: T171494
Change-Id: Ia9f23bc853e296b53d4a0c41e86b6e3c99f789ac
---
M hieradata/codfw/profile/openstack/labtest.yaml
A hieradata/codfw/profile/openstack/labtest/puppetmaster.yaml
A hieradata/codfw/profile/openstack/labtest/puppetmaster/encapi.yaml
A hieradata/eqiad/profile/openstack/main/puppetmaster.yaml
M hieradata/hosts/labpuppetmaster1001.yaml
M hieradata/hosts/labpuppetmaster1002.yaml
M hieradata/hosts/labtestpuppetmaster2001.yaml
A hieradata/role/codfw/wmcs/openstack/labtest/puppetmaster/frontend.yaml
A hieradata/role/eqiad/wmcs/openstack/main/puppetmaster/backend.yaml
A hieradata/role/eqiad/wmcs/openstack/main/puppetmaster/frontend.yaml
M manifests/site.pp
D modules/labspuppetbackend/files/.pep8
R modules/openstack2/files/puppet/master/encapi/labspuppetbackend.py
R modules/openstack2/files/puppet/master/encapi/labspuppetbackendgetter.conf
R modules/openstack2/files/puppet/master/encapi/schema.sql
R modules/openstack2/files/puppet/master/encapi/tox.ini
R modules/openstack2/files/puppet/master/instance-info-dumper.py
R modules/openstack2/files/puppet/master/labs-puppet-enc.py
R modules/openstack2/manifests/puppet/master/enc.pp
R modules/openstack2/manifests/puppet/master/encapi.pp
R modules/openstack2/manifests/puppet/master/instance_info_dumper.pp
A modules/profile/manifests/openstack/base/puppetmaster/backend.pp
A modules/profile/manifests/openstack/base/puppetmaster/common.pp
A modules/profile/manifests/openstack/base/puppetmaster/frontend.pp
A modules/profile/manifests/openstack/labtest/puppetmaster/frontend.pp
A modules/profile/manifests/openstack/main/puppetmaster/backend.pp
A modules/profile/manifests/openstack/main/puppetmaster/frontend.pp
D modules/profile/manifests/puppetmaster/labsencapi.pp
A
modules/profile/templates/openstack/base/puppetmaster/extra_auth_rules.conf.erb
A modules/role/manifests/wmcs/openstack/labtest/puppetmaster/frontend.pp
A modules/role/manifests/wmcs/openstack/main/puppetmaster/backend.pp
A modules/role/manifests/wmcs/openstack/main/puppetmaster/frontend.pp
D modules/role/templates/labs/puppetmaster/extra_auth_rules.conf.erb
33 files changed, 389 insertions(+), 90 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/12/386612/1
diff --git a/hieradata/codfw/profile/openstack/labtest.yaml
b/hieradata/codfw/profile/openstack/labtest.yaml
index 73fd91f..7ea2a2c 100644
--- a/hieradata/codfw/profile/openstack/labtest.yaml
+++ b/hieradata/codfw/profile/openstack/labtest.yaml
@@ -13,3 +13,4 @@
profile::openstack::labtest::rabbit_file_handles: 8192
profile::openstack::labtest::osm_host: 'labtestwikitech.wikimedia.org'
profile::openstack::labtest::ldap_hosts: ['labtestservices2001.wikimedia.org']
+profile::openstack::labtest::statsd_host: '127.0.0.1'
diff --git a/hieradata/codfw/profile/openstack/labtest/puppetmaster.yaml
b/hieradata/codfw/profile/openstack/labtest/puppetmaster.yaml
new file mode 100644
index 000..a1f4ada
--- /dev/null
+++ b/hieradata/codfw/profile/openstack/labtest/puppetmaster.yaml
@@ -0,0 +1,6 @@
+profile::openstack::labtest::puppetmaster::web_hostname:
labtest-puppetmaster.wikimedia.org
+profile::openstack::labtest::puppetmaster::baremetal: []
+profile::openstack::labtest::puppetmaster::ca:
'labtestpuppetmaster2001.wikimedia.org'
+profile::openstack::labtest::puppetmaster::servers:
+ labtestpuppetmaster2001.wikimedia.org:
+- { worker: labtestpuppetmaster2001.wikimedia.org, loadfactor: 10 }
diff --git a/hieradata/codfw/profile/openstack/labtest/puppetmaster/encapi.yaml
b/hieradata/codfw/profile/openstack/labtest/puppetmaster/encapi.yaml
new file mode 100644
index 000..ae11168
--- /dev/null
+++ b/hieradata/codfw/profile/openstack/labtest/puppetmaster/encapi.yaml
@@ -0,0 +1,5 @@
+profile::openstack::labtest::puppetmaster::encapi::db_host:
'labtestcontrol2001.wikimedia.org'
+profile::openstack::labtest::puppetmaster::encapi::db_name: 'labspuppet'
+profile::openstack::labtest::puppetmaster::encapi::db_user: 'labspuppet'
+profile::openstack::labtest::puppetmaster::encapi::statsd_prefix:
'labtest.puppetbackend'
+
diff --git a/hieradata/eqiad/profile/openstack/main/puppetmaster.yaml
b/hieradata/eqiad/profile/openstack/main/puppetmaster.yaml
new file mode 100644
index 000..5050c58
--- /dev/null
+++ b/hieradata/eqiad/profile/openstack/main/puppetmaster.yaml
@@ -0,0 +1,7 @@
+profile::openstack::main::puppetmaster::web_hostname:
'labs-puppetmaster.wikimedia.org'
+profile::openstack::main::puppetmaster::ca: 'labpuppetmaster1001.wikimedia.org'
+profile::openstack::main::puppetmaster::baremetal: ['10.64.20.12']
+profile::openstack::main::puppetmaster::servers:
+ labpuppetmaster1001.wikimedia.org:
+- { worker: la
[MediaWiki-commits] [Gerrit] operations/puppet[production]: graphite: cleanup cassandra metrics
Filippo Giunchedi has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/386587 )
Change subject: graphite: cleanup cassandra metrics
..
graphite: cleanup cassandra metrics
Bug: T179057
Change-Id: I0cef0b9a94ba59b41608f6248def5ad2e2552ad5
---
M modules/role/manifests/graphite/production.pp
1 file changed, 6 insertions(+), 0 deletions(-)
Approvals:
Eevans: Looks good to me, but someone else must approve
Mobrovac: Looks good to me, but someone else must approve
jenkins-bot: Verified
Filippo Giunchedi: Looks good to me, approved
diff --git a/modules/role/manifests/graphite/production.pp
b/modules/role/manifests/graphite/production.pp
index 4b97ee7..dc0bef2 100644
--- a/modules/role/manifests/graphite/production.pp
+++ b/modules/role/manifests/graphite/production.pp
@@ -56,6 +56,12 @@
keep_days => 15,
}
+# Cassandra metrics - T179057
+graphite::whisper_cleanup { 'graphite-cassandra':
+directory => "${storage_dir}/whisper/cassandra",
+keep_days => 182,
+}
+
$graphite_hosts = [
'graphite1001.eqiad.wmnet',
'graphite1003.eqiad.wmnet',
--
To view, visit https://gerrit.wikimedia.org/r/386587
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0cef0b9a94ba59b41608f6248def5ad2e2552ad5
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi
Gerrit-Reviewer: Eevans
Gerrit-Reviewer: Filippo Giunchedi
Gerrit-Reviewer: Giuseppe Lavagetto
Gerrit-Reviewer: Mobrovac
Gerrit-Reviewer: Ppchelko
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Add library hint for ICU
Muehlenhoff has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/386613 ) Change subject: Add library hint for ICU .. Add library hint for ICU Change-Id: Ibb1d44a481b7df1e0af5d87f2a0864d79066a9ef --- M modules/profile/templates/debdeploy/debdeploy.erb 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/13/386613/1 diff --git a/modules/profile/templates/debdeploy/debdeploy.erb b/modules/profile/templates/debdeploy/debdeploy.erb index cc42874..03e1ddf 100644 --- a/modules/profile/templates/debdeploy/debdeploy.erb +++ b/modules/profile/templates/debdeploy/debdeploy.erb @@ -13,6 +13,7 @@ gdk-pixbuf = libgdk_pixbuf_xlib-2.0, libgdk_pixbuf-2.0 ghostscript = libgs gnutls28 = libgnutls-openssl, libgnutls-deb0, libgnutls +icu = libicudata, libicui18n, libicuio, libicule, libiculx, libicutest, libicutu, libicuuc libgd2 = libgd libidn = libidn libidn2-0 = libidn2 -- To view, visit https://gerrit.wikimedia.org/r/386613 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibb1d44a481b7df1e0af5d87f2a0864d79066a9ef Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Muehlenhoff ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: require_package: puppet 4.x compatibility
Giuseppe Lavagetto has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/386614 )
Change subject: require_package: puppet 4.x compatibility
..
require_package: puppet 4.x compatibility
While we're still not converting this function to the new function API
introduced in puppet 4, a few details needed to be tweaked in order to
keep working. Namely:
- known_resource_types becomes compiler.environment.known_resource_types
- function_foo calls are deprecated (finally), so use call_function instead.
Bug: T179033
Change-Id: I2cf1d659f02cd9ea6b9f38058fab8deac4f4e53c
---
M modules/wmflib/lib/puppet/parser/functions/require_package.rb
1 file changed, 4 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/14/386614/1
diff --git a/modules/wmflib/lib/puppet/parser/functions/require_package.rb
b/modules/wmflib/lib/puppet/parser/functions/require_package.rb
index 996462f..dacf820 100644
--- a/modules/wmflib/lib/puppet/parser/functions/require_package.rb
+++ b/modules/wmflib/lib/puppet/parser/functions/require_package.rb
@@ -30,7 +30,7 @@
host = compiler.topscope.find_hostclass(class_name)
unless host
host = Puppet::Resource::Type.new(:hostclass, class_name)
-known_resource_types.add_hostclass(host)
+compiler.environment.known_resource_types.add_hostclass(host)
end
# Create class scope
@@ -44,14 +44,13 @@
begin
host_scope = compiler.topscope.class_scope(host)
-host_scope.function_create_resources(
- ['package', { package_name => { :ensure => :present } }])
+host_scope.call_function(:create_resources,
+ ['package', { package_name => { :ensure =>
:present } }])
rescue Puppet::Resource::Catalog::DuplicateResourceError
end
# Declare dependency
-
- send Puppet::Parser::Functions.function(:require), [class_name]
+ call_function :require, [class_name]
end
end
end
--
To view, visit https://gerrit.wikimedia.org/r/386614
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2cf1d659f02cd9ea6b9f38058fab8deac4f4e53c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Wikidata[wmf/1.31.0-wmf.5]: Make search for titles be always uppercase
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/386598 )
Change subject: Make search for titles be always uppercase
..
Make search for titles be always uppercase
Fortunately, wikidata titles are uppercase.
We may need better solution, but that may require full
reindex.
Bug: T179045
Change-Id: I3471c833108a88d6ee8436e48c587c7e7e08b93f
---
M extensions/Wikibase/repo/includes/Search/Elastic/EntitySearchElastic.php
M
extensions/Wikibase/repo/tests/phpunit/data/entitySearch/search_de-ch-en.expected
M extensions/Wikibase/repo/tests/phpunit/data/entitySearch/search_de-ch.expected
M
extensions/Wikibase/repo/tests/phpunit/data/entitySearch/search_de-ch_strict.expected
M extensions/Wikibase/repo/tests/phpunit/data/entitySearch/search_en.expected
M
extensions/Wikibase/repo/tests/phpunit/data/entitySearch/search_en_strict.expected
A extensions/Wikibase/repo/tests/phpunit/data/entitySearch/search_id.expected
A extensions/Wikibase/repo/tests/phpunit/data/entitySearch/search_id.query
8 files changed, 187 insertions(+), 6 deletions(-)
Approvals:
Zfilipin: Looks good to me, approved
jenkins-bot: Verified
diff --git
a/extensions/Wikibase/repo/includes/Search/Elastic/EntitySearchElastic.php
b/extensions/Wikibase/repo/includes/Search/Elastic/EntitySearchElastic.php
index 5e94101..b80bfcc 100644
--- a/extensions/Wikibase/repo/includes/Search/Elastic/EntitySearchElastic.php
+++ b/extensions/Wikibase/repo/includes/Search/Elastic/EntitySearchElastic.php
@@ -187,7 +187,9 @@
$labelsQuery = new BoolQuery();
$labelsQuery->addFilter( $labelsFilter );
$labelsQuery->addMust( $dismax );
- $titleMatch = new Term( [ 'title.keyword' => $text ] );
+ // TODO: this is a bit hacky, better way would be to make the
field case-insensitive
+ // or add new subfiled which is case-insensitive
+ $titleMatch = new Term( [ 'title.keyword' => strtoupper( $text
) ] );
// Match either labels or exact match to title
$query->addShould( $labelsQuery );
diff --git
a/extensions/Wikibase/repo/tests/phpunit/data/entitySearch/search_de-ch-en.expected
b/extensions/Wikibase/repo/tests/phpunit/data/entitySearch/search_de-ch-en.expected
index 48d79ef..4a28724 100644
---
a/extensions/Wikibase/repo/tests/phpunit/data/entitySearch/search_de-ch-en.expected
+++
b/extensions/Wikibase/repo/tests/phpunit/data/entitySearch/search_de-ch-en.expected
@@ -129,7 +129,7 @@
},
{
"term": {
-"title.keyword": "Wien"
+"title.keyword": "WIEN"
}
}
],
diff --git
a/extensions/Wikibase/repo/tests/phpunit/data/entitySearch/search_de-ch.expected
b/extensions/Wikibase/repo/tests/phpunit/data/entitySearch/search_de-ch.expected
index 48ef5ea..81b6ba1 100644
---
a/extensions/Wikibase/repo/tests/phpunit/data/entitySearch/search_de-ch.expected
+++
b/extensions/Wikibase/repo/tests/phpunit/data/entitySearch/search_de-ch.expected
@@ -129,7 +129,7 @@
},
{
"term": {
-"title.keyword": "Wien"
+"title.keyword": "WIEN"
}
}
],
diff --git
a/extensions/Wikibase/repo/tests/phpunit/data/entitySearch/search_de-ch_strict.expected
b/extensions/Wikibase/repo/tests/phpunit/data/entitySearch/search_de-ch_strict.expected
index bc3b388..2163aca 100644
---
a/extensions/Wikibase/repo/tests/phpunit/data/entitySearch/search_de-ch_strict.expected
+++
b/extensions/Wikibase/repo/tests/phpunit/data/entitySearch/search_de-ch_strict.expected
@@ -59,7 +59,7 @@
},
{
"term": {
-"title.keyword": "Wien"
+"title.keyword": "WIEN"
}
}
],
diff --git
a/extensions/Wikibase/repo/tests/phpunit/data/entitySearch/search_en.expected
b/extensions/Wikibase/repo/tests/phpunit/data/entitySearch/search_en.expected
index 857c6bf..e745659 100644
---
a/extensions/Wikibase/repo/tests/phpunit/data/entitySearch/search_en.expected
+++
b/extensions/Wikibase/repo/tests/phpunit/data/entitySearch/search_en.expected
@@ -69,7 +69,7 @@
},
{
"term": {
-"title.keyword": "Duck"
+"title.keyword": "DUCK"
}
}
],
diff --git
a/extensions/Wikibase/repo/tests/phpunit/data/entitySearch/search_en_strict.expected
b/extensions/Wikibase/repo/tests/phpunit/data/entity
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Add library hint for ICU
Muehlenhoff has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/386613 ) Change subject: Add library hint for ICU .. Add library hint for ICU Change-Id: Ibb1d44a481b7df1e0af5d87f2a0864d79066a9ef --- M modules/profile/templates/debdeploy/debdeploy.erb 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Muehlenhoff: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/profile/templates/debdeploy/debdeploy.erb b/modules/profile/templates/debdeploy/debdeploy.erb index cc42874..03e1ddf 100644 --- a/modules/profile/templates/debdeploy/debdeploy.erb +++ b/modules/profile/templates/debdeploy/debdeploy.erb @@ -13,6 +13,7 @@ gdk-pixbuf = libgdk_pixbuf_xlib-2.0, libgdk_pixbuf-2.0 ghostscript = libgs gnutls28 = libgnutls-openssl, libgnutls-deb0, libgnutls +icu = libicudata, libicui18n, libicuio, libicule, libiculx, libicutest, libicutu, libicuuc libgd2 = libgd libidn = libidn libidn2-0 = libidn2 -- To view, visit https://gerrit.wikimedia.org/r/386613 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibb1d44a481b7df1e0af5d87f2a0864d79066a9ef Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Muehlenhoff Gerrit-Reviewer: Muehlenhoff 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...Wikibase[master]: Add CacheRetrievingEntityRevisionLookup+EntityRevisionCache
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/384322 )
Change subject: Add CacheRetrievingEntityRevisionLookup+EntityRevisionCache
..
Add CacheRetrievingEntityRevisionLookup+EntityRevisionCache
Basically split out of CachingEntityRevisionLookup, so that we
can use them separately.
Bug: T178247
Change-Id: I736e9ab5421a826b9c0e93dd6163fc17fbf814af
---
M client/includes/Store/Sql/DirectSqlStore.php
A lib/includes/Store/CacheRetrievingEntityRevisionLookup.php
M lib/includes/Store/CachingEntityRevisionLookup.php
A lib/includes/Store/EntityRevisionCache.php
A lib/tests/phpunit/Store/CacheRetrievingEntityRevisionLookupTest.php
M lib/tests/phpunit/Store/CachingEntityRevisionLookupTest.php
A lib/tests/phpunit/Store/EntityRevisionCacheTest.php
M repo/includes/Store/Sql/DatabaseSchemaUpdater.php
M repo/includes/Store/Sql/SqlStore.php
M repo/tests/phpunit/includes/Store/WikiPageEntityRevisionLookupTest.php
10 files changed, 559 insertions(+), 114 deletions(-)
Approvals:
Hoo man: Looks good to me, but someone else must approve
jenkins-bot: Verified
Thiemo Mättig (WMDE): Looks good to me, approved
diff --git a/client/includes/Store/Sql/DirectSqlStore.php
b/client/includes/Store/Sql/DirectSqlStore.php
index 5118911..e5d0404 100644
--- a/client/includes/Store/Sql/DirectSqlStore.php
+++ b/client/includes/Store/Sql/DirectSqlStore.php
@@ -29,6 +29,7 @@
use Wikibase\Lib\EntityIdComposer;
use Wikibase\Lib\Store\CachingEntityRevisionLookup;
use Wikibase\Lib\Store\CachingSiteLinkLookup;
+use Wikibase\Lib\Store\EntityRevisionCache;
use Wikibase\Lib\Store\Sql\EntityChangeLookup;
use Wikibase\Lib\Store\EntityNamespaceLookup;
use Wikibase\Lib\Store\EntityRevisionLookup;
@@ -346,18 +347,20 @@
// Lower caching layer using persistent cache (e.g. memcached).
$persistentCachingLookup = new CachingEntityRevisionLookup(
- $dispatchingLookup,
- wfGetCache( $this->cacheType ),
- $this->cacheDuration,
- $cacheKeyPrefix
+ new EntityRevisionCache(
+ wfGetCache( $this->cacheType ),
+ $this->cacheDuration,
+ $cacheKeyPrefix
+ ),
+ $dispatchingLookup
);
// We need to verify the revision ID against the database to
avoid stale data.
$persistentCachingLookup->setVerifyRevision( true );
// Top caching layer using an in-process hash.
$hashCachingLookup = new CachingEntityRevisionLookup(
- $persistentCachingLookup,
- new HashBagOStuff( [ 'maxKeys' => 1000 ] )
+ new EntityRevisionCache( new HashBagOStuff( [ 'maxKeys'
=> 1000 ] ) ),
+ $persistentCachingLookup
);
// No need to verify the revision ID, we'll ignore updates that
happen during the request.
$hashCachingLookup->setVerifyRevision( false );
diff --git a/lib/includes/Store/CacheRetrievingEntityRevisionLookup.php
b/lib/includes/Store/CacheRetrievingEntityRevisionLookup.php
new file mode 100644
index 000..2913e1d
--- /dev/null
+++ b/lib/includes/Store/CacheRetrievingEntityRevisionLookup.php
@@ -0,0 +1,157 @@
+cache = $cache;
+ $this->lookup = $lookup;
+ }
+
+ /**
+* Determine whether the revision of the cached entity should be
verified against the
+* current revision in the underlying lookup.
+*
+* @param bool $shouldVerifyRevision
+*/
+ public function setVerifyRevision( $shouldVerifyRevision ) {
+ $this->shouldVerifyRevision = $shouldVerifyRevision;
+ }
+
+ /**
+* Get an EntityRevision from cache or (otherwise) from the underlying
EntityRevisionLookup.
+*
+* @see EntityRevisionLookup::getEntityRevision
+*
+* @note: If this lookup is configured to verify revisions,
getLatestRevisionId()
+* will be called on the underlying lookup to check whether the cached
revision is
+* still the latest. Otherwise, any cached revision will be used if
$revisionId=0.
+*
+* @param EntityId $entityId
+* @param int $revisionId The desired revision id, or 0 for the latest
revision.
+* @param string $mode One of the EntityRevisionLookup::LATEST_*
constants.
+*
+* @throws StorageException
+* @return EntityRevision|null
+*/
+ public function getEntityRevision(
+ EntityId $entityId,
+ $revisionId = 0,
+ $mode = self::LATEST_FROM_REPLICA
+ ) {
+ Assert::parameterType( 'integer', $revisionId, '$revisionId' );
+
[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[wmf/1.31.0-wmf.5]: Make search for titles be always uppercase
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/386548 )
Change subject: Make search for titles be always uppercase
..
Make search for titles be always uppercase
Fortunately, wikidata titles are uppercase.
We may need better solution, but that may require full
reindex.
Bug: T179045
Change-Id: I83259e34b49b18ae8d4bff0ccb8c7738c0ea0d05
(cherry picked from commit 4f91ffb6dba082aee721a402f602e85add2c0107)
---
M repo/includes/Search/Elastic/EntitySearchElastic.php
M repo/tests/phpunit/data/entitySearch/search_de-ch-en.expected
M repo/tests/phpunit/data/entitySearch/search_de-ch.expected
M repo/tests/phpunit/data/entitySearch/search_de-ch_strict.expected
M repo/tests/phpunit/data/entitySearch/search_en.expected
M repo/tests/phpunit/data/entitySearch/search_en_strict.expected
A repo/tests/phpunit/data/entitySearch/search_id.expected
A repo/tests/phpunit/data/entitySearch/search_id.query
8 files changed, 187 insertions(+), 6 deletions(-)
Approvals:
Hoo man: Looks good to me, but someone else must approve
Zfilipin: Looks good to me, approved
jenkins-bot: Verified
diff --git a/repo/includes/Search/Elastic/EntitySearchElastic.php
b/repo/includes/Search/Elastic/EntitySearchElastic.php
index 5e94101..b80bfcc 100644
--- a/repo/includes/Search/Elastic/EntitySearchElastic.php
+++ b/repo/includes/Search/Elastic/EntitySearchElastic.php
@@ -187,7 +187,9 @@
$labelsQuery = new BoolQuery();
$labelsQuery->addFilter( $labelsFilter );
$labelsQuery->addMust( $dismax );
- $titleMatch = new Term( [ 'title.keyword' => $text ] );
+ // TODO: this is a bit hacky, better way would be to make the
field case-insensitive
+ // or add new subfiled which is case-insensitive
+ $titleMatch = new Term( [ 'title.keyword' => strtoupper( $text
) ] );
// Match either labels or exact match to title
$query->addShould( $labelsQuery );
diff --git a/repo/tests/phpunit/data/entitySearch/search_de-ch-en.expected
b/repo/tests/phpunit/data/entitySearch/search_de-ch-en.expected
index 48d79ef..4a28724 100644
--- a/repo/tests/phpunit/data/entitySearch/search_de-ch-en.expected
+++ b/repo/tests/phpunit/data/entitySearch/search_de-ch-en.expected
@@ -129,7 +129,7 @@
},
{
"term": {
-"title.keyword": "Wien"
+"title.keyword": "WIEN"
}
}
],
diff --git a/repo/tests/phpunit/data/entitySearch/search_de-ch.expected
b/repo/tests/phpunit/data/entitySearch/search_de-ch.expected
index 48ef5ea..81b6ba1 100644
--- a/repo/tests/phpunit/data/entitySearch/search_de-ch.expected
+++ b/repo/tests/phpunit/data/entitySearch/search_de-ch.expected
@@ -129,7 +129,7 @@
},
{
"term": {
-"title.keyword": "Wien"
+"title.keyword": "WIEN"
}
}
],
diff --git a/repo/tests/phpunit/data/entitySearch/search_de-ch_strict.expected
b/repo/tests/phpunit/data/entitySearch/search_de-ch_strict.expected
index bc3b388..2163aca 100644
--- a/repo/tests/phpunit/data/entitySearch/search_de-ch_strict.expected
+++ b/repo/tests/phpunit/data/entitySearch/search_de-ch_strict.expected
@@ -59,7 +59,7 @@
},
{
"term": {
-"title.keyword": "Wien"
+"title.keyword": "WIEN"
}
}
],
diff --git a/repo/tests/phpunit/data/entitySearch/search_en.expected
b/repo/tests/phpunit/data/entitySearch/search_en.expected
index 857c6bf..e745659 100644
--- a/repo/tests/phpunit/data/entitySearch/search_en.expected
+++ b/repo/tests/phpunit/data/entitySearch/search_en.expected
@@ -69,7 +69,7 @@
},
{
"term": {
-"title.keyword": "Duck"
+"title.keyword": "DUCK"
}
}
],
diff --git a/repo/tests/phpunit/data/entitySearch/search_en_strict.expected
b/repo/tests/phpunit/data/entitySearch/search_en_strict.expected
index c6a9848..939a7d7 100644
--- a/repo/tests/phpunit/data/entitySearch/search_en_strict.expected
+++ b/repo/tests/phpunit/data/entitySearch/search_en_strict.expected
@@ -59,7 +59,7 @@
},
{
"term": {
-"title.keyword": "Duck"
+"title.keyword": "DUCK"
}
}
],
diff --git a/rep
[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Add missing Lua tests and clean up
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/386111 )
Change subject: Add missing Lua tests and clean up
..
Add missing Lua tests and clean up
This adds Lua integration tests for:
* mw.wikibase.getEntityUrl
* mw.wikibase.getPropertyOrder
* mw.wikibase.orderProperties
Change-Id: I742f40ae892563debe7cd2ccbb0ccda55789274c
---
M client/tests/phpunit/includes/DataAccess/Scribunto/LuaWikibaseLibraryTests.lua
M
client/tests/phpunit/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibraryTest.php
2 files changed, 41 insertions(+), 2 deletions(-)
Approvals:
jenkins-bot: Verified
Thiemo Mättig (WMDE): Looks good to me, approved
diff --git
a/client/tests/phpunit/includes/DataAccess/Scribunto/LuaWikibaseLibraryTests.lua
b/client/tests/phpunit/includes/DataAccess/Scribunto/LuaWikibaseLibraryTests.lua
index 73de15f..80292f8 100644
---
a/client/tests/phpunit/includes/DataAccess/Scribunto/LuaWikibaseLibraryTests.lua
+++
b/client/tests/phpunit/includes/DataAccess/Scribunto/LuaWikibaseLibraryTests.lua
@@ -87,6 +87,12 @@
return mw.wikibase.formatValues( snaks )
end
+local function testGetEntityUrl( expectedItemId, itemId )
+ local url = mw.wikibase.getEntityUrl( itemId )
+
+ return url:match( '//.*/' .. expectedItemId ) ~= nil
+end
+
local tests = {
-- Integration tests
@@ -118,7 +124,7 @@
args = { 0, 'P12' },
expect = "bad argument #1 to 'getBestStatements' (string expected,
got number)"
},
- { name = 'mw.wikibase.getBestStatements (entityId must be string)',
func = mw.wikibase.getBestStatements, type='ToString',
+ { name = 'mw.wikibase.getBestStatements (propertyId must be string)',
func = mw.wikibase.getBestStatements, type='ToString',
args = { 'Q2', 12 },
expect = "bad argument #2 to 'getBestStatements' (string expected,
got number)"
},
@@ -132,7 +138,7 @@
args = { 0, 'P12' },
expect = "bad argument #1 to 'getAllStatements' (string expected, got
number)"
},
- { name = 'mw.wikibase.getAllStatements (entityId must be string)', func
= mw.wikibase.getAllStatements, type='ToString',
+ { name = 'mw.wikibase.getAllStatements (propertyId must be string)',
func = mw.wikibase.getAllStatements, type='ToString',
args = { 'Q2', 12 },
expect = "bad argument #2 to 'getAllStatements' (string expected, got
number)"
},
@@ -311,6 +317,33 @@
args = { 'foo' },
expect = { nil }
},
+ { name = 'mw.wikibase.getEntityUrl (by entity id)', func =
testGetEntityUrl,
+ args = { 'Q42', 'Q42' },
+ expect = { true }
+ },
+ { name = 'mw.wikibase.getEntityUrl (connected page)', func =
testGetEntityUrl,
+ args = { 'Q32487', nil },
+ expect = { true }
+ },
+ { name = 'mw.wikibase.getEntityUrl (must be string or nil)', func =
mw.wikibase.getEntityUrl,
+ args = { -1 },
+ expect = "bad argument #1 to 'getEntityUrl' (string or nil expected,
got number)"
+ },
+ { name = 'mw.wikibase.getEntityUrl (invalid entity id)', func =
mw.wikibase.getEntityUrl,
+ args = { "BlahBlah" },
+ expect = { nil }
+ },
+ { name = 'mw.wikibase.getPropertyOrder', func =
mw.wikibase.getPropertyOrder,
+ expect = { { ['P1'] = 0, ['P22'] = 1, ['P11'] = 2 } }
+ },
+ { name = 'mw.wikibase.orderProperties', func =
mw.wikibase.orderProperties,
+ args = { { 'P22', 'P1', 'P44', 'Llama' } },
+ expect = { { 'P1', 'P22', 'P44', 'Llama' } }
+ },
+ { name = 'mw.wikibase.orderProperties (must be table)', func =
mw.wikibase.orderProperties,
+ args = { function() end },
+ expect = "bad argument #1 to 'orderProperties' (table expected, got
function)"
+ },
}
return testframework.getTestProvider( tests )
diff --git
a/client/tests/phpunit/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibraryTest.php
b/client/tests/phpunit/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibraryTest.php
index 423268d..16c70a2 100644
---
a/client/tests/phpunit/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibraryTest.php
+++
b/client/tests/phpunit/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibraryTest.php
@@ -20,6 +20,7 @@
* @group WikibaseIntegration
* @group WikibaseClient
* @group Wikibase
+ * @group Database
*
* @license GPL-2.0+
* @author Katie Filbert < aude.w...@gmail.com >
@@ -55,6 +56,11 @@
$settings = WikibaseClient::getDefaultInstance()->getSettings();
$this->oldAllowDataAccessInUserLanguage =
$settings->getSetting( 'allowDataAccessInUserLanguage' );
$this->setAllowDataAccessInUserLanguage( false );
+
+ $this->insertPage(
+ 'MediaWiki:Wikibase-SortedProperties',
+
[MediaWiki-commits] [Gerrit] operations/puppet[production]: hieradata: expand SMART health check rollout in codfw
Filippo Giunchedi has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/386603 ) Change subject: hieradata: expand SMART health check rollout in codfw .. hieradata: expand SMART health check rollout in codfw Select a few host "classes" based on hostname prefix to install smartmontools and export SMART attributes once an hour. Bug: T86552 Change-Id: I9d545dbde29ea3bec68645735e8556a9a151185a --- M hieradata/hosts/db2044.yaml M hieradata/hosts/db2079.yaml D hieradata/hosts/eventlog2001.yaml D hieradata/hosts/labtestservices2001.yaml D hieradata/hosts/ms-be2015.yaml D hieradata/hosts/ms-be2020.yaml D hieradata/hosts/ms-fe2005.yaml M hieradata/hosts/mwlog2001.yaml D hieradata/hosts/thumbor2001.yaml M hieradata/regex.yaml 10 files changed, 5 insertions(+), 9 deletions(-) Approvals: Marostegui: Looks good to me, but someone else must approve jenkins-bot: Verified Filippo Giunchedi: Looks good to me, approved Gehel: Looks good to me, but someone else must approve Volans: Looks good to me, but someone else must approve diff --git a/hieradata/hosts/db2044.yaml b/hieradata/hosts/db2044.yaml index 2b323d0..7db8adb 100644 --- a/hieradata/hosts/db2044.yaml +++ b/hieradata/hosts/db2044.yaml @@ -1,2 +1 @@ mariadb::shard: 's4' -profile::base::check_smart: true diff --git a/hieradata/hosts/db2079.yaml b/hieradata/hosts/db2079.yaml index f149ed8..0d8bce2 100644 --- a/hieradata/hosts/db2079.yaml +++ b/hieradata/hosts/db2079.yaml @@ -1,2 +1 @@ mariadb::shard: 's5' -profile::base::check_smart: true diff --git a/hieradata/hosts/eventlog2001.yaml b/hieradata/hosts/eventlog2001.yaml deleted file mode 100644 index 9c155cc..000 --- a/hieradata/hosts/eventlog2001.yaml +++ /dev/null @@ -1 +0,0 @@ -profile::base::check_smart: true diff --git a/hieradata/hosts/labtestservices2001.yaml b/hieradata/hosts/labtestservices2001.yaml deleted file mode 100644 index 9c155cc..000 --- a/hieradata/hosts/labtestservices2001.yaml +++ /dev/null @@ -1 +0,0 @@ -profile::base::check_smart: true diff --git a/hieradata/hosts/ms-be2015.yaml b/hieradata/hosts/ms-be2015.yaml deleted file mode 100644 index 9c155cc..000 --- a/hieradata/hosts/ms-be2015.yaml +++ /dev/null @@ -1 +0,0 @@ -profile::base::check_smart: true diff --git a/hieradata/hosts/ms-be2020.yaml b/hieradata/hosts/ms-be2020.yaml deleted file mode 100644 index 9c155cc..000 --- a/hieradata/hosts/ms-be2020.yaml +++ /dev/null @@ -1 +0,0 @@ -profile::base::check_smart: true diff --git a/hieradata/hosts/ms-fe2005.yaml b/hieradata/hosts/ms-fe2005.yaml deleted file mode 100644 index 9c155cc..000 --- a/hieradata/hosts/ms-fe2005.yaml +++ /dev/null @@ -1 +0,0 @@ -profile::base::check_smart: true diff --git a/hieradata/hosts/mwlog2001.yaml b/hieradata/hosts/mwlog2001.yaml index 26312d6..19e695d 100644 --- a/hieradata/hosts/mwlog2001.yaml +++ b/hieradata/hosts/mwlog2001.yaml @@ -4,4 +4,3 @@ - mw-log-readers role::logging::mediawiki::udp2log::rsync_slow_parse: false role::logging::mediawiki::udp2log::forward_messages: false -profile::base::check_smart: true diff --git a/hieradata/hosts/thumbor2001.yaml b/hieradata/hosts/thumbor2001.yaml deleted file mode 100644 index 9c155cc..000 --- a/hieradata/hosts/thumbor2001.yaml +++ /dev/null @@ -1 +0,0 @@ -profile::base::check_smart: true diff --git a/hieradata/regex.yaml b/hieradata/regex.yaml index 87320bf..83851a6 100644 --- a/hieradata/regex.yaml +++ b/hieradata/regex.yaml @@ -344,3 +344,8 @@ __regex: !ruby/regexp /^(analytics|aqs|conf|cp|db|dbproxy|druid|elastic|es|etcd|ganeti|kafka)1\d\d\d\.eqiad\.wmnet$/ profile::base::remote_syslog_tls: ['syslog.eqiad.wmnet:6514', 'syslog.codfw.wmnet:6514'] profile::base::remote_syslog: [] + +# Gradual SMART health checking rollout - T86552 +smart_health_codfw: + __regex: !ruby/regexp /^(auth|conf|cp|db|dbstore|elastic|es|ganeti|graphite|maps-test|mc|ores|oresrdb|pc|rdb|restbase-test|sca|scb)2\d\d\d\.codfw\.wmnet$/ + profile::base::check_smart: true -- To view, visit https://gerrit.wikimedia.org/r/386603 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9d545dbde29ea3bec68645735e8556a9a151185a Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Filippo Giunchedi Gerrit-Reviewer: Alexandros Kosiaris Gerrit-Reviewer: Ema Gerrit-Reviewer: Filippo Giunchedi Gerrit-Reviewer: Gehel Gerrit-Reviewer: Giuseppe Lavagetto Gerrit-Reviewer: Jcrespo Gerrit-Reviewer: Marostegui Gerrit-Reviewer: Volans Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: varnish: ensure consistent CL
Ema has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/386616 )
Change subject: varnish: ensure consistent CL
..
varnish: ensure consistent CL
Disable streaming on the backend-most varnish if the response has no
Content-Length. This ensures that all other varnishes will have a CL
header available to use for size-based decisions.
Ref: https://phabricator.wikimedia.org/P6190
Change-Id: I12f25df4d6e2f8d34329bad0646734a35f9f30a5
---
M modules/varnish/templates/vcl/wikimedia-backend.vcl.erb
1 file changed, 7 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/16/386616/1
diff --git a/modules/varnish/templates/vcl/wikimedia-backend.vcl.erb
b/modules/varnish/templates/vcl/wikimedia-backend.vcl.erb
index 258e629..0e198ce 100644
--- a/modules/varnish/templates/vcl/wikimedia-backend.vcl.erb
+++ b/modules/varnish/templates/vcl/wikimedia-backend.vcl.erb
@@ -197,6 +197,13 @@
unset beresp.http.Public-Key-Pins;
unset beresp.http.Public-Key-Pins-Report-Only;
+ // If this is the backend-most varnish and the response has no CL
header,
+ // disable streaming so that all other varnishes will have access to CL
for
+ // size-based decisions. See https://phabricator.wikimedia.org/P6190
+ if (!bereq.http.X-Next-Is-Cache && !beresp.http.Content-Length) {
+ set beresp.do_stream = false;
+ }
+
call cluster_be_backend_response_early; // e.g. to fix up Vary-slotting
in bereq
call wm_common_backend_response;
call cluster_be_backend_response;
--
To view, visit https://gerrit.wikimedia.org/r/386616
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I12f25df4d6e2f8d34329bad0646734a35f9f30a5
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ema
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...WikibaseQualityConstraints[master]: Fix sorting of NullResults
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/386597 )
Change subject: Fix sorting of NullResults
..
Fix sorting of NullResults
Commit a4c1832358 (change I60ad838dda) introduced the NullResult type,
which is a fake result holding no constraint to ensure that certain
contexts still appear in the API response even if they have no
constraints defined on them. However, the DelegatingConstraintChecker
sometimes look at the constraint of a result: when sorting the results,
it first sorts by status, then by snak, but if those are identical, then
it looks at the constraint type. If there are two identical statements
on an entity included in a constraint check, they will both add a
NullResult to the result list, and the comparer will blow up trying to
compare the two NullResults, since the snaks are identical.
Bug: T179038
Change-Id: I48ac2d947020f4dbf3c6c87ec5c098a4114de373
---
M includes/ConstraintCheck/DelegatingConstraintChecker.php
M tests/phpunit/DelegatingConstraintCheckerTest.php
2 files changed, 29 insertions(+), 0 deletions(-)
Approvals:
Ladsgroup: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/ConstraintCheck/DelegatingConstraintChecker.php
b/includes/ConstraintCheck/DelegatingConstraintChecker.php
index 198fef6..869381f 100644
--- a/includes/ConstraintCheck/DelegatingConstraintChecker.php
+++ b/includes/ConstraintCheck/DelegatingConstraintChecker.php
@@ -19,6 +19,7 @@
use WikibaseQuality\ConstraintReport\ConstraintCheck\Helper\LoggingHelper;
use
WikibaseQuality\ConstraintReport\ConstraintCheck\Helper\SparqlHelperException;
use WikibaseQuality\ConstraintReport\ConstraintCheck\Result\CheckResult;
+use WikibaseQuality\ConstraintReport\ConstraintCheck\Result\NullResult;
use WikibaseQuality\ConstraintReport\ConstraintLookup;
use WikibaseQuality\ConstraintReport\Constraint;
use Wikibase\DataModel\Entity\EntityId;
@@ -573,6 +574,13 @@
$hashB =
$b->getContext()->getSnak()->getHash();
if ( $hashA === $hashB ) {
+ if ( $a instanceof NullResult )
{
+ return $b instanceof
NullResult ? 0 : -1;
+ }
+ if ( $b instanceof NullResult )
{
+ return $a instanceof
NullResult ? 0 : 1;
+ }
+
$typeA =
$a->getConstraint()->getConstraintTypeItemId();
$typeB =
$b->getConstraint()->getConstraintTypeItemId();
diff --git a/tests/phpunit/DelegatingConstraintCheckerTest.php
b/tests/phpunit/DelegatingConstraintCheckerTest.php
index eafa1c8..72b9a60 100644
--- a/tests/phpunit/DelegatingConstraintCheckerTest.php
+++ b/tests/phpunit/DelegatingConstraintCheckerTest.php
@@ -14,6 +14,7 @@
use Wikibase\Repo\Tests\NewStatement;
use
WikibaseQuality\ConstraintReport\ConstraintCheck\Helper\ConstraintParameterException;
use
WikibaseQuality\ConstraintReport\ConstraintCheck\DelegatingConstraintChecker;
+use WikibaseQuality\ConstraintReport\ConstraintCheck\Result\NullResult;
use WikibaseQuality\ConstraintReport\ConstraintReportFactory;
use WikibaseQuality\ConstraintReport\Tests\ConstraintParameters;
use WikibaseQuality\ConstraintReport\Tests\ResultAssertions;
@@ -364,6 +365,26 @@
$this->assertEmpty( $result );
}
+ public function testCheckOnEntityIdNullResult() {
+ $statement = NewStatement::forProperty( 'P2' )
+ ->withValue( 'foo' );
+ $entity = NewItem::withId( 'Q2' )
+ ->andStatement( $statement )
+ ->andStatement( $statement )
+ ->build();
+ $this->lookup->addEntity( $entity );
+
+ $result =
$this->constraintChecker->checkAgainstConstraintsOnEntityId(
+ $entity->getId(),
+ null,
+ function( $context ) {
+ return [ new NullResult( $context ) ];
+ }
+ );
+
+ $this->assertCount( 2, $result );
+ }
+
public function testCheckOnEntityIdUnknownConstraint() {
$entity = NewItem::withId( 'Q3' )
->andStatement(
--
To view, visit https://gerrit.wikimedia.org/r/386597
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I48ac2d947020f4dbf3c6c87ec5c098a4114de373
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/WikibaseQualityConstraints
Gerrit-Branch: master
Gerrit-Owner: Lucas Werkmeister (WMDE
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Revert "db-eqiad.php: Depool db1101"
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/386609 ) Change subject: Revert "db-eqiad.php: Depool db1101" .. Revert "db-eqiad.php: Depool db1101" This reverts commit 33cf1c71f83d12d770ecb2dfd119179fb7f7c7e5. Change-Id: I47b2213c6e7ddd9012876bc7c84aee6b7a627e59 --- M wmf-config/db-eqiad.php 1 file changed, 7 insertions(+), 7 deletions(-) Approvals: Marostegui: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 328a887..ca28006 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -118,8 +118,8 @@ # 'db1060' => 1, # C2 2.8TB 96GB, api #master for sanitarium #T153743 #T174509 'db1074' => 300, # A2 3.6TB 512GB, api 'db1076' => 500, # B1 3.6TB 512GB - 'db1090' => 1, # C3 3.6TB 512GB # temporary watchlist and rc - # 'db1101' => 1, # C2 3.6TB 512GB, watchlist, recentchanges, contributions, logpager, old master 2 #T174509 + 'db1090' => 500, # C3 3.6TB 512GB + 'db1101' => 1, # C2 3.6TB 512GB, watchlist, recentchanges, contributions, logpager, old master 2 ], /* s3 */ 'DEFAULT' => [ 'db1075' => 0, # A2 3.6TB 512GB, master @@ -289,19 +289,19 @@ 'db1074' => 1, ], 'watchlist' => [ - 'db1090' => 1, + 'db1101' => 1, ], 'recentchanges' => [ - 'db1090' => 1, + 'db1101' => 1, ], 'recentchangeslinked' => [ - 'db1090' => 1, + 'db1101' => 1, ], 'contributions' => [ - 'db1090' => 1, + 'db1101' => 1, ], 'logpager' => [ - 'db1090' => 1, + 'db1101' => 1, ], ], /* s3 */ 'DEFAULT' => [ -- To view, visit https://gerrit.wikimedia.org/r/386609 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I47b2213c6e7ddd9012876bc7c84aee6b7a627e59 Gerrit-PatchSet: 3 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Marostegui Gerrit-Reviewer: Jcrespo Gerrit-Reviewer: Marostegui Gerrit-Reviewer: Urbanecm Gerrit-Reviewer: Zoranzoki21 Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Ship a dummy config since IncludeOptional isn't really optional
Muehlenhoff has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/386617 )
Change subject: Ship a dummy config since IncludeOptional isn't really optional
..
Ship a dummy config since IncludeOptional isn't really optional
IncludeOptional in the current implementation only bails out gracefully
if the path spec contains a wildcard, if it uses a specific name it
fails.
Luca proposed at patch in https://bz.apache.org/bugzilla/show_bug.cgi?id=57585
to fix this, but until now we need to ship a dummy config (or we'd need to
patch modsecurity-crs)
Change-Id: I79f30acb05f3db9b656e3282cf9a6bba9ddea3af
---
M modules/mediawiki/manifests/web.pp
1 file changed, 13 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/17/386617/1
diff --git a/modules/mediawiki/manifests/web.pp
b/modules/mediawiki/manifests/web.pp
index cef6796..342af4e 100644
--- a/modules/mediawiki/manifests/web.pp
+++ b/modules/mediawiki/manifests/web.pp
@@ -31,15 +31,27 @@
# is only optional for the full path, so if /usr/share/modsecurity-crs
doesn't
# exist, it bails out and apache refuses to start/restart. As such, ship an
# empty directory to make that include truly optional
+# In addition IncludeOptional expects a wildcard (which the original config
+# from modsecurity-crs doesn't ship, so we also need to ship an empty
+# stub config
# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=878920
# https://bz.apache.org/bugzilla/show_bug.cgi?id=57585
+# Once we're running a version of the patch proposed in Apache bugzilla,
this
+# workaround can be removed
if os_version('debian >= stretch') {
file { '/usr/share/modsecurity-crs':
ensure => directory,
owner => 'root',
group => 'root',
mode => '0775',
-before => Service['apache2'],
+before => File['/usr/share/modsecurity-crs/owasp-crs.load'],
+}
+file { '/usr/share/modsecurity-crs/owasp-crs.load':
+owner => 'root',
+content => '',
+group => 'root',
+mode=> '0444',
+before => Service['apache2'],
}
}
--
To view, visit https://gerrit.wikimedia.org/r/386617
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I79f30acb05f3db9b656e3282cf9a6bba9ddea3af
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: varnish: ensure consistent CL
Ema has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/386616 )
Change subject: varnish: ensure consistent CL
..
varnish: ensure consistent CL
Disable streaming on the backend-most varnish if the response has no
Content-Length. This ensures that all other varnishes will have a CL
header available to use for size-based decisions.
Ref: https://phabricator.wikimedia.org/P6190
Change-Id: I12f25df4d6e2f8d34329bad0646734a35f9f30a5
---
M modules/varnish/templates/misc-backend.inc.vcl.erb
M modules/varnish/templates/vcl/wikimedia-backend.vcl.erb
2 files changed, 7 insertions(+), 15 deletions(-)
Approvals:
Ema: Looks good to me, approved
BBlack: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/modules/varnish/templates/misc-backend.inc.vcl.erb
b/modules/varnish/templates/misc-backend.inc.vcl.erb
index 875849b..5ac4859 100644
--- a/modules/varnish/templates/misc-backend.inc.vcl.erb
+++ b/modules/varnish/templates/misc-backend.inc.vcl.erb
@@ -20,21 +20,6 @@
set beresp.uncacheable = true;
return (deliver);
}
-
-<% if not @varnish_testing -%>
-if (!bereq.http.X-Next-Is-Cache) {
-<% end -%>
-// Direct backend caches:
-// Disable streaming if no Content-Length present. This is the
default in
-// varnish3, but in varnish4 this should convert them to responses
-// containing a Content-Length in the common case, so that upper caches
-// can make size-based decisions.
-if (!beresp.http.Content-Length) {
-set beresp.do_stream = false;
-}
-<% if not @varnish_testing -%>
-}
-<% end -%>
}
sub cluster_be_deliver { }
diff --git a/modules/varnish/templates/vcl/wikimedia-backend.vcl.erb
b/modules/varnish/templates/vcl/wikimedia-backend.vcl.erb
index 258e629..0e198ce 100644
--- a/modules/varnish/templates/vcl/wikimedia-backend.vcl.erb
+++ b/modules/varnish/templates/vcl/wikimedia-backend.vcl.erb
@@ -197,6 +197,13 @@
unset beresp.http.Public-Key-Pins;
unset beresp.http.Public-Key-Pins-Report-Only;
+ // If this is the backend-most varnish and the response has no CL
header,
+ // disable streaming so that all other varnishes will have access to CL
for
+ // size-based decisions. See https://phabricator.wikimedia.org/P6190
+ if (!bereq.http.X-Next-Is-Cache && !beresp.http.Content-Length) {
+ set beresp.do_stream = false;
+ }
+
call cluster_be_backend_response_early; // e.g. to fix up Vary-slotting
in bereq
call wm_common_backend_response;
call cluster_be_backend_response;
--
To view, visit https://gerrit.wikimedia.org/r/386616
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I12f25df4d6e2f8d34329bad0646734a35f9f30a5
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ema
Gerrit-Reviewer: BBlack
Gerrit-Reviewer: Ema
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: AS/Gradle upgrade follow-up.
Dbrant has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/386618 )
Change subject: AS/Gradle upgrade follow-up.
..
AS/Gradle upgrade follow-up.
Change-Id: I44a370965e03c3e59a7cd3bef0d46e067e6099cf
---
M app/build.gradle
M build.gradle
M scripts/make-release.py
3 files changed, 4 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/18/386618/1
diff --git a/app/build.gradle b/app/build.gradle
index 25060dc..53b231d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -25,7 +25,7 @@
println "Device timeout is ${DdmPreferences.getTimeOut()}ms"
}
-def getDate() {
+def static getDate() {
def date = new Date()
def formattedDate = date.format('-MM-dd')
return formattedDate
@@ -248,7 +248,7 @@
return config
}
-@Nullable private Properties loadProperties(File file) {
+private static Properties loadProperties(File file) {
Properties props = null
if (file.canRead()) {
props = new Properties()
diff --git a/build.gradle b/build.gradle
index 93171d3..f325a8a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -12,6 +12,6 @@
allprojects {
repositories {
jcenter()
-maven { url 'https://maven.google.com' }
+google()
}
}
diff --git a/scripts/make-release.py b/scripts/make-release.py
index 24efdb4..bbe2298 100755
--- a/scripts/make-release.py
+++ b/scripts/make-release.py
@@ -95,7 +95,7 @@
def get_original_apk_file_name(flavor):
-return 'app/build/outputs/apk/app-%s-release.apk' % flavor
+return 'app/build/outputs/apk/' + flavor + '/release/app-' + flavor +
'-release.apk'
def get_android_home():
--
To view, visit https://gerrit.wikimedia.org/r/386618
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I44a370965e03c3e59a7cd3bef0d46e067e6099cf
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Disable notifications for the ORES stresstests hosts
Alexandros Kosiaris has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/386619 ) Change subject: Disable notifications for the ORES stresstests hosts .. Disable notifications for the ORES stresstests hosts No reason to receive any notification from those Change-Id: I942fd8eed8e34acaf68fe36e416d12cd4dffbdcf --- M hieradata/role/common/ores/stresstest.yaml 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/19/386619/1 diff --git a/hieradata/role/common/ores/stresstest.yaml b/hieradata/role/common/ores/stresstest.yaml index 0680d7d..9a91ee8 100644 --- a/hieradata/role/common/ores/stresstest.yaml +++ b/hieradata/role/common/ores/stresstest.yaml @@ -6,3 +6,4 @@ profile::ores::celery::queue_maxsize: 400 # The password is in the private store, this is here for completeness # profile::ores::web::redis_password: nothing +profile::base::notifications_enabled: '0' -- To view, visit https://gerrit.wikimedia.org/r/386619 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I942fd8eed8e34acaf68fe36e416d12cd4dffbdcf Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Alexandros Kosiaris ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Gradle -> 4.1
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/386572 )
Change subject: Gradle -> 4.1
..
Gradle -> 4.1
https://docs.gradle.org/4.1/release-notes.html
Change-Id: I2466a9a4d273955f5f153eecc895760df7228639
---
M gradle/wrapper/gradle-wrapper.jar
M gradle/wrapper/gradle-wrapper.properties
M gradlew
3 files changed, 4 insertions(+), 5 deletions(-)
Approvals:
Dbrant: Looks good to me, approved
jenkins-bot: Verified
diff --git a/gradle/wrapper/gradle-wrapper.jar
b/gradle/wrapper/gradle-wrapper.jar
index 765f741..7a3265e 100644
--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
Binary files differ
diff --git a/gradle/wrapper/gradle-wrapper.properties
b/gradle/wrapper/gradle-wrapper.properties
index 6acef2a..f16d266 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Mon Feb 27 16:23:10 EST 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-bin.zip
diff --git a/gradlew b/gradlew
index 4453cce..cccdd3d 100755
--- a/gradlew
+++ b/gradlew
@@ -33,11 +33,11 @@
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"
-warn ( ) {
+warn () {
echo "$*"
}
-die ( ) {
+die () {
echo
echo "$*"
echo
@@ -155,7 +155,7 @@
fi
# Escape application args
-save ( ) {
+save () {
for i do printf %s\\n "$i" | sed "s/'/'''/g;1s/^/'/;\$s/\$/' /" ;
done
echo " "
}
--
To view, visit https://gerrit.wikimedia.org/r/386572
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2466a9a4d273955f5f153eecc895760df7228639
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Mholloway
Gerrit-Reviewer: Brion VIBBER
Gerrit-Reviewer: Cooltey
Gerrit-Reviewer: Dbrant
Gerrit-Reviewer: Sharvaniharan
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: graphite: Use systemd::tmpfile
Muehlenhoff has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/385994 )
Change subject: graphite: Use systemd::tmpfile
..
graphite: Use systemd::tmpfile
Change-Id: I05d07ad501d3b005f3a5f5666013e33efc77993b
---
M modules/graphite/manifests/init.pp
1 file changed, 1 insertion(+), 5 deletions(-)
Approvals:
Muehlenhoff: Looks good to me, approved
jenkins-bot: Verified
Filippo Giunchedi: Looks good to me, but someone else must approve
diff --git a/modules/graphite/manifests/init.pp
b/modules/graphite/manifests/init.pp
index 3e2f77b..37e3566 100644
--- a/modules/graphite/manifests/init.pp
+++ b/modules/graphite/manifests/init.pp
@@ -159,12 +159,8 @@
# create required directory in /run at reboot, don't wait for a puppet
# run to fix it
-file { '/usr/lib/tmpfiles.d/graphite.conf':
-ensure => present,
-mode=> '0444',
+systemd::tmpfile { 'graphite':
content => 'd /var/run/carbon 0755 _graphite _graphite',
-owner => 'root',
-group => 'root',
}
rsyslog::conf { 'graphite':
--
To view, visit https://gerrit.wikimedia.org/r/385994
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I05d07ad501d3b005f3a5f5666013e33efc77993b
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff
Gerrit-Reviewer: Filippo Giunchedi
Gerrit-Reviewer: Muehlenhoff
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Disable notifications for the ORES stresstests hosts
Alexandros Kosiaris has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/386619 ) Change subject: Disable notifications for the ORES stresstests hosts .. Disable notifications for the ORES stresstests hosts No reason to receive any notification from those Change-Id: I942fd8eed8e34acaf68fe36e416d12cd4dffbdcf --- M hieradata/role/common/ores/stresstest.yaml 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Alexandros Kosiaris: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/hieradata/role/common/ores/stresstest.yaml b/hieradata/role/common/ores/stresstest.yaml index 0680d7d..9a91ee8 100644 --- a/hieradata/role/common/ores/stresstest.yaml +++ b/hieradata/role/common/ores/stresstest.yaml @@ -6,3 +6,4 @@ profile::ores::celery::queue_maxsize: 400 # The password is in the private store, this is here for completeness # profile::ores::web::redis_password: nothing +profile::base::notifications_enabled: '0' -- To view, visit https://gerrit.wikimedia.org/r/386619 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I942fd8eed8e34acaf68fe36e416d12cd4dffbdcf Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Alexandros Kosiaris Gerrit-Reviewer: Alexandros Kosiaris Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: JAVA_VERSION -> 1.8
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/386574 )
Change subject: JAVA_VERSION -> 1.8
..
JAVA_VERSION -> 1.8
Have fun!
https://developer.android.com/studio/write/java8-support.html
Change-Id: Ia5ce2a805190c0af95358ad253381f29b5af8485
---
M app/build.gradle
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Dbrant: Looks good to me, approved
jenkins-bot: Verified
diff --git a/app/build.gradle b/app/build.gradle
index 579476e..25060dc 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -35,7 +35,7 @@
return "2.6.${android.defaultConfig.versionCode}-${label}-${date}"
}
-final JavaVersion JAVA_VERSION = JavaVersion.VERSION_1_7
+final JavaVersion JAVA_VERSION = JavaVersion.VERSION_1_8
android {
// Keep version in sync with /project.properties
compileSdkVersion 26
--
To view, visit https://gerrit.wikimedia.org/r/386574
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia5ce2a805190c0af95358ad253381f29b5af8485
Gerrit-PatchSet: 2
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Mholloway
Gerrit-Reviewer: Brion VIBBER
Gerrit-Reviewer: Cooltey
Gerrit-Reviewer: Dbrant
Gerrit-Reviewer: Sharvaniharan
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Android Gradle Plugin -> 3.0.0
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/386573 )
Change subject: Android Gradle Plugin -> 3.0.0
..
Android Gradle Plugin -> 3.0.0
Bumps the Android Gradle Plugin to 3.0.0 and makes the minimum required
changes to compile. Primarily this involved adding a "default" flavor
dimension so that all product flavors could be assigned to a flavor
dimension as now required.[1]
Downgrades the new AppLinkUrlError lint issue to a warning to prevent
lint failures. For more on this issue (and Firebase App Indexing, which
appears to help surface the app in Google Search results), see:
https://firebase.google.com/docs/app-indexing/
Additionally, I updated now-deprecated dependency configuration names to
their new counterparts.[2]
Please see the full Android Gradle Plugin 3.0.0 migration guide for
details.
https://developer.android.com/studio/build/gradle-plugin-3-0-0-migration.html
[1]
https://developer.android.com/studio/build/gradle-plugin-3-0-0-migration.html#flavor_dimensions
[2]
https://developer.android.com/studio/build/gradle-plugin-3-0-0-migration.html#new_configurations
Change-Id: I7df1b28de77a49d7104a260b1d1c2bb2ca72bca6
---
M app/build.gradle
M app/lint.xml
M build.gradle
3 files changed, 53 insertions(+), 41 deletions(-)
Approvals:
Dbrant: Looks good to me, approved
jenkins-bot: Verified
diff --git a/app/build.gradle b/app/build.gradle
index c797876..579476e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -94,45 +94,55 @@
}
}
+flavorDimensions 'default'
+
productFlavors {
dev {
versionName computeVersionName('dev')
applicationIdSuffix 'dev'
signingConfig signingConfigs.debug
testInstrumentationRunner 'org.wikipedia.test.AndroidTestRunner'
+dimension 'default'
}
prod {
versionName computeVersionName('r')
signingConfig signingConfigs.prod
+dimension 'default'
}
releasesprod {
versionName computeVersionName('releasesprod')
signingConfig signingConfigs.prod
+dimension 'default'
}
alpha {
versionName computeVersionName('alpha')
applicationIdSuffix 'alpha'
signingConfig signingConfigs.debug
testInstrumentationRunner 'org.wikipedia.test.AndroidTestRunner'
+dimension 'default'
}
beta {
versionName computeVersionName('beta')
applicationIdSuffix 'beta'
signingConfig signingConfigs.prod
+dimension 'default'
}
amazon {
versionName computeVersionName('amazon')
signingConfig signingConfigs.prod
+dimension 'default'
}
fdroid {
versionName computeVersionName('fdroid')
signingConfig signingConfigs.prod
+dimension 'default'
}
custom {
versionName computeVersionName(customChannel)
// next line is for injecting a custom channel value into the
custom/AndroidManifest.xml
manifestPlaceholders =
[customChannel:getProperty('customChannel').toString()]
signingConfig signingConfigs.prod
+dimension 'default'
}
}
@@ -167,37 +177,37 @@
String mockitoCore = 'org.mockito:mockito-core:1.9.5'
String leakCanaryVersion = '1.5'
-compile "com.android.support:support-compat:$supportVersion"
-compile "com.android.support:support-core-utils:$supportVersion"
-compile "com.android.support:support-core-ui:$supportVersion"
-compile "com.android.support:support-fragment:$supportVersion"
+implementation "com.android.support:support-compat:$supportVersion"
+implementation "com.android.support:support-core-utils:$supportVersion"
+implementation "com.android.support:support-core-ui:$supportVersion"
+implementation "com.android.support:support-fragment:$supportVersion"
-compile "com.android.support:cardview-v7:$supportVersion"
-compile "com.android.support:design:$supportVersion"
-compile "com.android.support:recyclerview-v7:$supportVersion"
-compile "com.android.support:palette-v7:$supportVersion"
-compile "com.android.support:preference-v14:$supportVersion"
+implementation "com.android.support:cardview-v7:$supportVersion"
+implementation "com.android.support:design:$supportVersion"
+implementation "com.android.support:recyclerview-v7:$supportVersion"
+implementation "com.android.support:palette-v7:$supportVersion"
+implementation "com.android.support:preference-v14:$supportVersion"
-compile "com.facebook.fresco:animated-gif:$frescoVersion"
-compile "com.facebook.fresco:fresco:$frescoVersion"
-compile "com.facebook.fresco:imagepipeline-okhttp3:$frescoVe
[MediaWiki-commits] [Gerrit] operations/puppet[production]: uwsgi: Use systemd::tmpfile
Muehlenhoff has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/386620 )
Change subject: uwsgi: Use systemd::tmpfile
..
uwsgi: Use systemd::tmpfile
Change-Id: I7fe225c6cf5ce67a7b3f1107676e604e289cd05f
---
M modules/uwsgi/manifests/init.pp
1 file changed, 1 insertion(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/20/386620/1
diff --git a/modules/uwsgi/manifests/init.pp b/modules/uwsgi/manifests/init.pp
index 6de63a0..37f3d91 100644
--- a/modules/uwsgi/manifests/init.pp
+++ b/modules/uwsgi/manifests/init.pp
@@ -51,11 +51,7 @@
# additionally, ensure that /run/uwsgi is created at boot
if os_version('debian >= jessie') {
-file { '/etc/tmpfiles.d/uwsgi-startup.conf':
-ensure => present,
-owner => 'root',
-group => 'root',
-mode=> '0444',
+systemd::tmpfile { 'uwsgi-startup':
content => 'd /run/uwsgi 0755 www-data www-data',
}
} else {
--
To view, visit https://gerrit.wikimedia.org/r/386620
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7fe225c6cf5ce67a7b3f1107676e604e289cd05f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: keyholder: Use systemd::tmpfile
Muehlenhoff has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/386621 )
Change subject: keyholder: Use systemd::tmpfile
..
keyholder: Use systemd::tmpfile
Change-Id: Id98e1b0d20cbc0cc71191de88b3e201f7faeebe9
---
M modules/keyholder/manifests/init.pp
1 file changed, 1 insertion(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/21/386621/1
diff --git a/modules/keyholder/manifests/init.pp
b/modules/keyholder/manifests/init.pp
index 47c8572..64f2393 100644
--- a/modules/keyholder/manifests/init.pp
+++ b/modules/keyholder/manifests/init.pp
@@ -50,11 +50,7 @@
}
if os_version('debian >= jessie') {
-file { '/etc/tmpfiles.d/keyholder.conf':
-ensure => present,
-owner => 'root',
-group => 'root',
-mode=> '0444',
+systemd::tmpfile { 'keyholder':
content => 'd /run/keyholder 0755 keyholder keyholder',
require => User['keyholder'],
}
--
To view, visit https://gerrit.wikimedia.org/r/386621
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id98e1b0d20cbc0cc71191de88b3e201f7faeebe9
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: AS/Gradle upgrade follow-up.
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/386618 )
Change subject: AS/Gradle upgrade follow-up.
..
AS/Gradle upgrade follow-up.
Change-Id: I44a370965e03c3e59a7cd3bef0d46e067e6099cf
---
M app/build.gradle
M build.gradle
M scripts/make-release.py
3 files changed, 4 insertions(+), 4 deletions(-)
Approvals:
Dbrant: Looks good to me, approved
jenkins-bot: Verified
diff --git a/app/build.gradle b/app/build.gradle
index 25060dc..53b231d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -25,7 +25,7 @@
println "Device timeout is ${DdmPreferences.getTimeOut()}ms"
}
-def getDate() {
+def static getDate() {
def date = new Date()
def formattedDate = date.format('-MM-dd')
return formattedDate
@@ -248,7 +248,7 @@
return config
}
-@Nullable private Properties loadProperties(File file) {
+private static Properties loadProperties(File file) {
Properties props = null
if (file.canRead()) {
props = new Properties()
diff --git a/build.gradle b/build.gradle
index 93171d3..f325a8a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -12,6 +12,6 @@
allprojects {
repositories {
jcenter()
-maven { url 'https://maven.google.com' }
+google()
}
}
diff --git a/scripts/make-release.py b/scripts/make-release.py
index 24efdb4..bbe2298 100755
--- a/scripts/make-release.py
+++ b/scripts/make-release.py
@@ -95,7 +95,7 @@
def get_original_apk_file_name(flavor):
-return 'app/build/outputs/apk/app-%s-release.apk' % flavor
+return 'app/build/outputs/apk/' + flavor + '/release/app-' + flavor +
'-release.apk'
def get_android_home():
--
To view, visit https://gerrit.wikimedia.org/r/386618
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I44a370965e03c3e59a7cd3bef0d46e067e6099cf
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant
Gerrit-Reviewer: Brion VIBBER
Gerrit-Reviewer: Cooltey
Gerrit-Reviewer: Dbrant
Gerrit-Reviewer: Sharvaniharan
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: require_package: puppet 4.x compatibility
Giuseppe Lavagetto has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/386614 )
Change subject: require_package: puppet 4.x compatibility
..
require_package: puppet 4.x compatibility
While we're still not converting this function to the new function API
introduced in puppet 4, a few details needed to be tweaked in order to
keep working. Namely:
- known_resource_types becomes compiler.environment.known_resource_types
- function_foo calls are deprecated (finally), so use call_function instead.
Bug: T179033
Change-Id: I2cf1d659f02cd9ea6b9f38058fab8deac4f4e53c
---
M modules/wmflib/lib/puppet/parser/functions/require_package.rb
1 file changed, 4 insertions(+), 5 deletions(-)
Approvals:
Giuseppe Lavagetto: Verified; Looks good to me, approved
Alexandros Kosiaris: Looks good to me, but someone else must approve
diff --git a/modules/wmflib/lib/puppet/parser/functions/require_package.rb
b/modules/wmflib/lib/puppet/parser/functions/require_package.rb
index 996462f..dacf820 100644
--- a/modules/wmflib/lib/puppet/parser/functions/require_package.rb
+++ b/modules/wmflib/lib/puppet/parser/functions/require_package.rb
@@ -30,7 +30,7 @@
host = compiler.topscope.find_hostclass(class_name)
unless host
host = Puppet::Resource::Type.new(:hostclass, class_name)
-known_resource_types.add_hostclass(host)
+compiler.environment.known_resource_types.add_hostclass(host)
end
# Create class scope
@@ -44,14 +44,13 @@
begin
host_scope = compiler.topscope.class_scope(host)
-host_scope.function_create_resources(
- ['package', { package_name => { :ensure => :present } }])
+host_scope.call_function(:create_resources,
+ ['package', { package_name => { :ensure =>
:present } }])
rescue Puppet::Resource::Catalog::DuplicateResourceError
end
# Declare dependency
-
- send Puppet::Parser::Functions.function(:require), [class_name]
+ call_function :require, [class_name]
end
end
end
--
To view, visit https://gerrit.wikimedia.org/r/386614
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2cf1d659f02cd9ea6b9f38058fab8deac4f4e53c
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto
Gerrit-Reviewer: Alexandros Kosiaris
Gerrit-Reviewer: Giuseppe Lavagetto
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...Wikibase[master]: Use CacheRetrievingEntityRevisionLookup for dumps etc.
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/386382 )
Change subject: Use CacheRetrievingEntityRevisionLookup for dumps etc.
..
Use CacheRetrievingEntityRevisionLookup for dumps etc.
Bug: T178247
Change-Id: I3cc52201cc4de00d9ba971ebdc90eb5dfaf448d2
---
M repo/includes/Store/Sql/SqlStore.php
M repo/includes/Store/Store.php
M repo/includes/WikibaseRepo.php
M repo/maintenance/dumpJson.php
M repo/maintenance/dumpRdf.php
M repo/maintenance/rebuildItemsPerSite.php
M repo/maintenance/rebuildTermSqlIndex.php
M repo/tests/phpunit/includes/Store/Sql/SqlStoreTest.php
8 files changed, 89 insertions(+), 28 deletions(-)
Approvals:
Ladsgroup: Looks good to me, approved
jenkins-bot: Verified
diff --git a/repo/includes/Store/Sql/SqlStore.php
b/repo/includes/Store/Sql/SqlStore.php
index e41e28c..5bb643d 100644
--- a/repo/includes/Store/Sql/SqlStore.php
+++ b/repo/includes/Store/Sql/SqlStore.php
@@ -15,6 +15,7 @@
use Wikibase\DataModel\Services\Lookup\RedirectResolvingEntityLookup;
use Wikibase\Lib\Changes\EntityChangeFactory;
use Wikibase\Lib\EntityIdComposer;
+use Wikibase\Lib\Store\CacheRetrievingEntityRevisionLookup;
use Wikibase\Lib\Store\CachingEntityRevisionLookup;
use Wikibase\Lib\Store\CacheAwarePropertyInfoStore;
use Wikibase\Lib\Store\CachingPropertyInfoLookup;
@@ -83,6 +84,11 @@
* @var EntityRevisionLookup|null
*/
private $rawEntityRevisionLookup = null;
+
+ /**
+* @var CacheRetrievingEntityRevisionLookup|null
+*/
+ private $cacheRetrievingEntityRevisionLookup = null;
/**
* @var EntityStore|null
@@ -360,12 +366,13 @@
*
* The EntityLookup returned by this method will resolve redirects.
*
-* @param string $uncached Flag string, set to 'uncached' to get an
uncached direct lookup service.
+* @param string $cache Flag string: Can be set to 'uncached' to get an
uncached direct lookup or to 'retrieve-only' to get a
+*lookup which reads from the cache, but doesn't store
retrieved entities there. Defaults to a caching lookup.
*
* @return EntityLookup
*/
- public function getEntityLookup( $uncached = '' ) {
- $revisionLookup = $this->getEntityRevisionLookup( $uncached );
+ public function getEntityLookup( $cache = '' ) {
+ $revisionLookup = $this->getEntityRevisionLookup( $cache );
$revisionBasedLookup = new RevisionBasedEntityLookup(
$revisionLookup );
$resolvingLookup = new RedirectResolvingEntityLookup(
$revisionBasedLookup );
return $resolvingLookup;
@@ -412,20 +419,31 @@
/**
* @see Store::getEntityRevisionLookup
*
-* @param string $uncached Flag string, set to 'uncached' to get an
uncached direct lookup service.
+* @param string $cache Flag string: Can be set to 'uncached' to get an
uncached direct lookup or to 'retrieve-only' to get a
+*lookup which reads from the cache, but doesn't store
retrieved entities there. Defaults to a caching lookup.
*
* @return EntityRevisionLookup
*/
- public function getEntityRevisionLookup( $uncached = '' ) {
+ public function getEntityRevisionLookup( $cache = '' ) {
if ( !$this->entityRevisionLookup ) {
list( $this->rawEntityRevisionLookup,
$this->entityRevisionLookup ) = $this->newEntityRevisionLookup();
}
- if ( $uncached === 'uncached' ) {
+ if ( $cache === 'uncached' ) {
return $this->rawEntityRevisionLookup;
+ } elseif ( $cache === 'retrieve-only' ) {
+ return $this->getCacheRetrievingEntityRevisionLookup();
} else {
return $this->entityRevisionLookup;
}
+ }
+
+ /**
+* @return string
+*/
+ private function getEntityRevisionLookupCacheKey() {
+ // NOTE: Keep cache key in sync with
DirectSqlStore::newEntityRevisionLookup in WikibaseClient
+ return $this->cacheKeyPrefix . ':WikiPageEntityRevisionLookup';
}
/**
@@ -436,9 +454,6 @@
* EntityRevisionLookup.
*/
private function newEntityRevisionLookup() {
- // NOTE: Keep cache key in sync with
DirectSqlStore::newEntityRevisionLookup in WikibaseClient
- $cacheKeyPrefix = $this->cacheKeyPrefix .
':WikiPageEntityRevisionLookup';
-
// Maintain a list of watchers to be notified of changes to any
entities,
// in order to update caches.
/** @var WikiPageEntityStore $dispatcher */
@@ -452,7 +467,7 @@
new EntityRevisionCache(
wfGetCac
[MediaWiki-commits] [Gerrit] mediawiki...mobileapps[master]: Hygiene: Always use node type constants
Mholloway has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/386622 )
Change subject: Hygiene: Always use node type constants
..
Hygiene: Always use node type constants
Change-Id: I4640902f726545e1e664d197b0278ab40d41189a
---
A lib/nodeType.js
M lib/parsoidSectionsUsingSectionTags.js
M lib/transformations/anchorPopUpMediaTransforms.js
M lib/transformations/extractLeadIntroduction.js
M lib/transforms.js
5 files changed, 33 insertions(+), 21 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/mobileapps
refs/changes/22/386622/1
diff --git a/lib/nodeType.js b/lib/nodeType.js
new file mode 100644
index 000..47cbfe0
--- /dev/null
+++ b/lib/nodeType.js
@@ -0,0 +1,21 @@
+'use strict';
+
+// Node type constants
+// https://developer.mozilla.org/en-US/docs/Web/API/Node/nodeType
+
+const Node = {
+ELEMENT_NODE: 1,
+// ATTRIBUTE_NODE : 2, // deprecated
+TEXT_NODE : 3,
+// CDATA_SECTION_NODE : 4, // deprecated
+// ENTITY_REFERENCE_NODE : 5, // deprecated
+// ENTITY_NODE : 6, // deprecated
+PROCESSING_INSTRUCTION_NODE : 7,
+COMMENT_NODE: 8,
+DOCUMENT_NODE : 9,
+DOCUMENT_TYPE_NODE : 10,
+DOCUMENT_FRAGMENT_NODE : 11,
+// NOTATION_NODE : 12 // deprecated
+};
+
+module.exports = Node;
diff --git a/lib/parsoidSectionsUsingSectionTags.js
b/lib/parsoidSectionsUsingSectionTags.js
index 05182ca..7ddbcf4 100644
--- a/lib/parsoidSectionsUsingSectionTags.js
+++ b/lib/parsoidSectionsUsingSectionTags.js
@@ -1,6 +1,7 @@
'use strict';
const parsoidDomUtils = require('parsoid-dom-utils');
+const Node = require('./nodeType');
/**
* @deprecated wait for Parsoid to implement this.
@@ -30,7 +31,7 @@
if (node.tagName !== 'SECTION') {
if (node.outerHTML) {
sectionText += node.outerHTML;
-} else if (node.nodeType === 3) {
+} else if (node.nodeType === Node.TEXT_NODE) {
sectionText += node.textContent;
}
node = node.nextSibling;
diff --git a/lib/transformations/anchorPopUpMediaTransforms.js
b/lib/transformations/anchorPopUpMediaTransforms.js
index 6feda15..d2e2638 100644
--- a/lib/transformations/anchorPopUpMediaTransforms.js
+++ b/lib/transformations/anchorPopUpMediaTransforms.js
@@ -12,6 +12,8 @@
'use strict';
+const Node = require('../nodeType');
+
/**
* Checks if a element is an actual video.
* Parsoid also uses tags for audio files.
@@ -27,7 +29,7 @@
// Look for an ancestor element
// or .
-if (node.nodeType === 1
+if (node.nodeType === Node.ELEMENT_NODE
&& (node.nodeName === 'FIGURE' ||
node.nodeName === 'FIGURE-INLINE' ||
// TODO: is here for backwards compatibility.
diff --git a/lib/transformations/extractLeadIntroduction.js
b/lib/transformations/extractLeadIntroduction.js
index b1a72b5..05722c5 100644
--- a/lib/transformations/extractLeadIntroduction.js
+++ b/lib/transformations/extractLeadIntroduction.js
@@ -1,5 +1,7 @@
'use strict';
+const Node = require('../nodeType');
+
/*
* Check whether a node has any content.
* @param {!DOMElement} node
@@ -30,11 +32,11 @@
remove.push(node);
nextSibling = node.nextSibling;
// check the next element is a text node or not in list of
blacklisted elements
-while (nextSibling && (nextSibling.nodeType === 3 ||
+while (nextSibling && (nextSibling.nodeType === Node.TEXT_NODE ||
blacklist.indexOf(nextSibling.tagName) === -1
)) {
// Deal with text nodes
-if (nextSibling.nodeType === 3) {
+if (nextSibling.nodeType === Node.TEXT_NODE) {
if (!isEmpty(nextSibling)) {
p += nextSibling.textContent;
}
diff --git a/lib/transforms.js b/lib/transforms.js
index dc24468..aef8a0b 100644
--- a/lib/transforms.js
+++ b/lib/transforms.js
@@ -20,31 +20,17 @@
const flattenElements = require('./transformations/flattenElements');
const summarize = require('./transformations/summarize');
const _rmAttributes = require('./transformations/removeAttributes');
+const Node = require('./nodeType');
const transforms = {};
-const NodeType =
-{
-ELEMENT: 1,
-// ATTRIBUTE : 2,
-TEXT : 3,
-// CDATA_SECTION : 4,
-// ENTITY_REFERENCE : 5,
-// ENTITY : 6,
-// PROCESSING_INSTRUCTION : 7,
-COMMENT: 8,
-// DOCUMENT : 9,
-// DOCUMENT_TYPE : 10,
-// DOCUMENT_FRAGMEN
[MediaWiki-commits] [Gerrit] mediawiki...mobileapps[master]: Hygiene: Use parallel requests in getMetadataActionApi
Mholloway has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/386623 )
Change subject: Hygiene: Use parallel requests in getMetadataActionApi
..
Hygiene: Use parallel requests in getMetadataActionApi
Change-Id: Ideba420dc690a85809343328a2b9b250d09bd923
---
M lib/mwapi.js
1 file changed, 65 insertions(+), 67 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/mobileapps
refs/changes/23/386623/1
diff --git a/lib/mwapi.js b/lib/mwapi.js
index 5414184..a77673a 100644
--- a/lib/mwapi.js
+++ b/lib/mwapi.js
@@ -4,6 +4,7 @@
'use strict';
+const BBPromise = require('bluebird');
const sUtil = require('./util');
const api = require('./api-util');
const HTTPError = sUtil.HTTPError;
@@ -155,7 +156,6 @@
* @return {!Promise} a promise resolving as an JSON object containing the
response
*/
function getMetadataActionApi(app, req) {
-let siteinfo;
const props = ['coordinates','pageprops', 'pageimages', 'pageterms',
'revisions',
'info', 'langlinks'];
@@ -171,75 +171,73 @@
prop: props.join('|')
});
-return mwapi.getSiteInfo(app, req)
- .then((si) => {
- siteinfo = si;
- return api.mwApiGet(app, req.params.domain, query);
- }).then((apiResponse) => {
- const body = apiResponse.body;
- const page = body.query && body.query.pages
- && body.query.pages[0];
- const coords = page && page.coordinates && page.coordinates[0];
- let geo;
- const revision = page && page.revisions && page.revisions[0];
- const pageprops = page && page.pageprops;
+return BBPromise.props({
+siteinfo: mwapi.getSiteInfo(app, req),
+metadata: api.mwApiGet(app, req.params.domain, query)
+}).then((res) => {
+const body = res.metadata.body;
+const page = body.query && body.query.pages && body.query.pages[0];
+const coords = page && page.coordinates && page.coordinates[0];
+const revision = page && page.revisions && page.revisions[0];
+const pageprops = page && page.pageprops;
+let geo;
- if (page.missing) {
- throw new HTTPError({
- status: 404,
- type: 'missingtitle',
- title: 'The page you requested doesn\'t exist',
- detail: apiResponse.body
- });
- }
+if (page.missing) {
+throw new HTTPError({
+status: 404,
+type: 'missingtitle',
+title: 'The page you requested doesn\'t exist',
+detail: body
+});
+}
- // Extract coordinates from the API response
- if (coords) {
- geo = {
- latitude: coords.lat,
- longitude: coords.lon
- };
- }
- const normalized = body.query
- && body.query.normalized && body.query.normalized[0]
- && body.query.normalized[0].to;
- const displayTitle = pageprops && pageprops.displaytitle;
- const title = page.title;
- const thumbUrl = page.thumbnail && page.thumbnail.source;
- const thumb = thumbUrl ? {
- url: thumbUrl.replace('https:', '')
- } : undefined;
- const image = page.pageimage ? {
- file: page.pageimage
- } : undefined;
- const protection = mwapi.simplifyProtectionObject(page.protection);
- const modifier = revision && revision.anon !== undefined ? { anon:
true } : {};
- modifier.user = revision && revision.user;
- // Always set to unknown until support in API added (T172228)
- modifier.gender = 'unknown';
- const mainpage = siteinfo.general.mainpage === title ? true :
undefined;
+// Extract coordinates from the API response
+if (coords) {
+geo = {
+latitude: coords.lat,
+longitude: coords.lon
+};
+}
+const normalized = body.query
+&& body.query.normalized && body.query.normalized[0]
+&& body.query.normalized[0].to;
+const displayTitle = pageprops && pageprops.displaytitle;
+const title = page.title;
+const thumbUrl = page.thumbnail && page.thumbnail.source;
+const thumb = thumbUrl ? {
+url: thumbUrl.replace('https:', '')
+} : undefined;
+const image = page.pageimage ? {
+file: page.pageimage
+} : undefined;
+const protection = mwapi.simplifyProtectionObject(page.protection);
+const modifier = revision && revision.anon !== undefined ? { anon:
true } : {};
+modifier.user = revision && revision.user;
+// Always set to unknown until support in API added (T172228)
+modifier.gender = 'unknown';
+
[MediaWiki-commits] [Gerrit] wikimedia...civicrm[master]: With undelete true, make only one activity with new contact ...
Mepps has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/386624 )
Change subject: With undelete true, make only one activity with new contact as
assignee
..
With undelete true, make only one activity with new contact as assignee
Bug: T178003
Change-Id: I8efcff50182a6598a5cfb6d78ff8208ab72ed9f2
---
M CRM/Dedupe/Merger.php
1 file changed, 12 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm/civicrm
refs/changes/24/386624/1
diff --git a/CRM/Dedupe/Merger.php b/CRM/Dedupe/Merger.php
index c249e28..f0df03e 100644
--- a/CRM/Dedupe/Merger.php
+++ b/CRM/Dedupe/Merger.php
@@ -1848,22 +1848,24 @@
1 => $otherId,
2 => $mainId,
);
-$activity = civicrm_api3('activity', 'create', array(
- 'source_contact_id' => CRM_Core_Session::getLoggedInContactID() ?
CRM_Core_Session::getLoggedInContactID() :
-$mainId,
- 'subject' => ts('Contact ID %1 has been merged and deleted.', $params),
- 'target_contact_id' => $mainId,
- 'activity_type_id' => 'Contact Merged',
- 'status_id' => 'Completed',
-));
-if (civicrm_api3('Setting', 'getvalue', array('name' =>
'contact_undelete', 'group' => 'CiviCRM Preferences'))) {
+if (!civicrm_api3('Setting', 'getvalue', array('name' =>
'contact_undelete', 'group' => 'CiviCRM Preferences'))) {
+ civicrm_api3('activity', 'create', array(
+'source_contact_id' => CRM_Core_Session::getLoggedInContactID() ?
CRM_Core_Session::getLoggedInContactID() :
+ $mainId,
+'subject' => ts('Contact ID %1 has been merged and deleted.', $params),
+'target_contact_id' => $mainId,
+'activity_type_id' => 'Contact Merged',
+'status_id' => 'Completed',
+ ));
+}
+else {
civicrm_api3('activity', 'create', array(
'source_contact_id' => CRM_Core_Session::getLoggedInContactID() ?
CRM_Core_Session::getLoggedInContactID() :
$otherId,
'subject' => ts('Contact ID %1 has been merged into Contact ID %2 and
deleted.', $params),
'target_contact_id' => $otherId,
+'assignee_id' => $mainId,
'activity_type_id' => 'Contact Deleted by Merge',
-'parent_id' => $activity['id'],
'status_id' => 'Completed',
));
}
--
To view, visit https://gerrit.wikimedia.org/r/386624
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8efcff50182a6598a5cfb6d78ff8208ab72ed9f2
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm/civicrm
Gerrit-Branch: master
Gerrit-Owner: Mepps
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
