Page MenuHomePhabricator
Create Task
Maniphest T290210

Add "restore associated talk page" option to ApiUndelete
Closed, ResolvedPublic3 Estimated Story PointsFeature
Actions

Description

Similar to T263209 for ApiDelete: the undelete API module should have an option that allows the user to undelete the associated talk of non-talk pages. This will only permit restoring all revisions of the talk page.

Acceptance criteria

  • Add an undeletetalk parameter to the Undelete API
  • If subject page undeletion fails (i.e. it doesn't have deleted revisions), talk page undeletion should be aborted
  • If restoring the associated talk page fails, restoring the subject page should still happen but with a warning about the talk page failing
  • If the talk page exists but has some deleted revisions, undeletetalk should restore them.

Details

SubjectRepoBranchLines +/-
ApiUndelete: Fix api bad method callmediawiki/coremaster+1 -1
ApiUndelete: add option to undelete associated talk pagemediawiki/coremaster+20 -8
Customize query in gerrit

Related Objects
Search...

Event Timeline

Daimona created this task.Sep 2 2021, 12:03 AM
Restricted Application added a subscriber: Aklapper. · View Herald TranscriptSep 2 2021, 12:03 AM
Daimona updated the task description. (Show Details)Sep 2 2021, 12:07 AM
Daimona moved this task from New & TBD Tickets to Up Next on the Community-Tech board.
Daimona set the point value for this task to 3.
Daimona added a parent task: T263211: Add "Restore associated talk page" option to special:undelete.Sep 2 2021, 12:11 AM
• NRodriguez moved this task from Up Next to CommTech-Sprint-9 on the Community-Tech board.Sep 13 2021, 7:03 PM
• NRodriguez edited projects, added Community-Tech (CommTech-Sprint-9); removed Community-Tech.
ldelench_wmf edited projects, added Community-Tech (CommTech-Sprint-10); removed Community-Tech (CommTech-Sprint-9).Sep 27 2021, 8:41 PM
ldelench_wmf moved this task from Backlog to 🌟Top Priority on the Undelete-Associated-Talk-Page (2021) board.Oct 8 2021, 6:17 PM
ldelench_wmf edited projects, added Community-Tech (CommTech-Sprint-11); removed Community-Tech (CommTech-Sprint-10).Oct 11 2021, 1:59 PM
ldelench_wmf moved this task from CommTech-Sprint-11 to CommTech-Sprint-12 on the Community-Tech board.Oct 25 2021, 8:04 PM
ldelench_wmf edited projects, added Community-Tech (CommTech-Sprint-12); removed Community-Tech (CommTech-Sprint-11).
ldelench_wmf moved this task from CommTech-Sprint-12 to CommTech-Sprint-13 on the Community-Tech board.Nov 8 2021, 9:55 PM
ldelench_wmf edited projects, added Community-Tech (CommTech-Sprint-13); removed Community-Tech (CommTech-Sprint-12).
Daimona claimed this task.Nov 9 2021, 5:22 PM
Daimona moved this task from Ready 🎬 to In Development 💻 on the Community-Tech (CommTech-Sprint-13) board.
ldelench_wmf added a parent task: T295389: [EPIC] User-facing changes for (Un)delete associated talk page.Nov 9 2021, 5:53 PM
ldelench_wmf edited projects, added Community-Tech (CommTech-Sprint-14); removed Community-Tech (CommTech-Sprint-13).Nov 22 2021, 9:34 PM
ldelench_wmf moved this task from Ready 🎬 to In Development 💻 on the Community-Tech (CommTech-Sprint-14) board.Nov 22 2021, 9:36 PM
ldelench_wmf edited projects, added Community-Tech (CommTech-Sprint-15); removed Community-Tech (CommTech-Sprint-14).Dec 3 2021, 7:49 PM
ldelench_wmf moved this task from Ready 🎬 to In Development 💻 on the Community-Tech (CommTech-Sprint-15) board.Dec 3 2021, 7:51 PM
ldelench_wmf edited projects, added Community-Tech (CommTech-Sprint-16); removed Community-Tech (CommTech-Sprint-15).Jan 4 2022, 5:08 PM
ldelench_wmf moved this task from Ready 🎬 to In Development 💻 on the Community-Tech (CommTech-Sprint-16) board.Jan 4 2022, 5:10 PM
ldelench_wmf edited projects, added Community-Tech (CommTech-Sprint-17); removed Community-Tech (CommTech-Sprint-16).Jan 18 2022, 8:13 PM
ldelench_wmf moved this task from Ready 🎬 to In Development 💻 on the Community-Tech (CommTech-Sprint-17) board.Jan 18 2022, 8:21 PM
ldelench_wmf edited projects, added Community-Tech (CommTech-Sprint-18); removed Community-Tech (CommTech-Sprint-17).Jan 31 2022, 2:33 PM
ldelench_wmf moved this task from Ready 🎬 to In Development 💻 on the Community-Tech (CommTech-Sprint-18) board.Jan 31 2022, 2:36 PM
• JMcLeod_WMF edited projects, added Community-Tech (CommTech-Sprint-19); removed Community-Tech (CommTech-Sprint-18).Feb 15 2022, 10:22 PM
• JMcLeod_WMF moved this task from Ready 🎬 to In Development 💻 on the Community-Tech (CommTech-Sprint-19) board.Feb 15 2022, 10:30 PM
• JMcLeod_WMF removed a project: Community-Tech (CommTech-Sprint-19).Mar 1 2022, 6:43 PM
• JMcLeod_WMF added a project: Community-Tech (CommTech-Sprint-20).Mar 1 2022, 6:53 PM
• JMcLeod_WMF moved this task from Ready 🎬 to In Development 💻 on the Community-Tech (CommTech-Sprint-20) board.Mar 1 2022, 7:01 PM
• JMcLeod_WMF edited projects, added Community-Tech (CommTech-Sprint-21); removed Community-Tech (CommTech-Sprint-20).Mar 16 2022, 12:17 PM
• JMcLeod_WMF moved this task from Ready 🎬 to In Development 💻 on the Community-Tech (CommTech-Sprint-21) board.Mar 16 2022, 12:23 PM
dmaza claimed this task.Mar 24 2022, 3:49 AM
gerritbot added a comment.Mar 28 2022, 12:23 PM

Change 747839 had a related patch set uploaded (by Dmaza; author: Daimona Eaytoy):

[mediawiki/core@master] ApiUndelete: add option to undelete associated talk page

https://gerrit.wikimedia.org/r/747839

gerritbot added a project: Patch-For-Review.Mar 28 2022, 12:23 PM
• JMcLeod_WMF edited projects, added Community-Tech (CommTech-Sprint-22); removed Community-Tech (CommTech-Sprint-21).Mar 28 2022, 2:41 PM
• JMcLeod_WMF moved this task from Ready 🎬 to In Development 💻 on the Community-Tech (CommTech-Sprint-22) board.Mar 28 2022, 2:44 PM
dmaza moved this task from In Development 💻 to Review/Feedback 💬 on the Community-Tech (CommTech-Sprint-22) board.Mar 29 2022, 2:55 PM
gerritbot added a comment.Mar 30 2022, 9:53 PM

Change 747839 merged by jenkins-bot:

[mediawiki/core@master] ApiUndelete: add option to undelete associated talk page

https://gerrit.wikimedia.org/r/747839

ReleaseTaggerBot added a project: MW-1.39-notes (1.39.0-wmf.6; 2022-04-04).Mar 30 2022, 10:00 PM
Maintenance_bot removed a project: Patch-For-Review.Mar 30 2022, 10:10 PM
dmaza moved this task from Review/Feedback 💬 to QA 🐛 on the Community-Tech (CommTech-Sprint-22) board.Mar 31 2022, 2:27 AM
MusikAnimal updated the task description. (Show Details)Mar 31 2022, 2:49 AM
MusikAnimal updated the task description. (Show Details)Mar 31 2022, 2:52 AM
MusikAnimal updated the task description. (Show Details)
MusikAnimal updated the task description. (Show Details)Mar 31 2022, 3:00 AM
dom_walden subscribed.Apr 1 2022, 3:21 PM

@dmaza I am getting an error undeleting some files on beta commons. I think it is related to the number of archived files (entries in filearchive).

For example:

The API response is:

{
    "error": {
        "code": "internal_api_error_InvalidArgumentException",
        "info": "[YkcQx@JzPJAbh3XaM4yBcAAAAFg] Exception caught: $key must be a string or an array",
        "errorclass": "InvalidArgumentException",
        "*": "InvalidArgumentException at /srv/mediawiki/php-master/includes/language/Message.php(245)\nfrom /srv/mediawiki/php-master/includes/language/Message.php(245)\n#0 /srv/mediawiki/php-master/includes/api/ApiMessage.php(88): Message->__construct(Status)\n#1 /srv/mediawiki/php-master/includes/api/ApiMessage.php(65): ApiMessage->__construct(Status, NULL, NULL)\n#2 /srv/mediawiki/php-master/includes/api/ApiUsageException.php(73): ApiMessage::create(Status, NULL, NULL)\n#3 /srv/mediawiki/php-master/includes/api/ApiBase.php(1445): ApiUsageException::newWithMessage(ApiUndelete, Status, NULL, NULL, NULL)\n#4 /srv/mediawiki/php-master/includes/api/ApiUndelete.php(114): ApiBase->dieWithError(Status)\n#5 /srv/mediawiki/php-master/includes/api/ApiMain.php(1898): ApiUndelete->execute()\n#6 /srv/mediawiki/php-master/includes/api/ApiMain.php(871): ApiMain->executeAction()\n#7 /srv/mediawiki/php-master/includes/api/ApiMain.php(842): ApiMain->executeActionWithErrorHandling()\n#8 /srv/mediawiki/php-master/api.php(90): ApiMain->execute()\n#9 /srv/mediawiki/php-master/api.php(45): wfApiMain()\n#10 /srv/mediawiki/w/api.php(3): require(string)\n#11 {main}"
    },
    "servedby": "deployment-mediawiki11"
}

Prettified it is:

InvalidArgumentException at /srv/mediawiki/php-master/includes/language/Message.php(245)
from /srv/mediawiki/php-master/includes/language/Message.php(245)
#0 /srv/mediawiki/php-master/includes/api/ApiMessage.php(88): Message->__construct(Status)
#1 /srv/mediawiki/php-master/includes/api/ApiMessage.php(65): ApiMessage->__construct(Status, NULL, NULL)
#2 /srv/mediawiki/php-master/includes/api/ApiUsageException.php(73): ApiMessage::create(Status, NULL, NULL)
#3 /srv/mediawiki/php-master/includes/api/ApiBase.php(1445): ApiUsageException::newWithMessage(ApiUndelete, Status, NULL, NULL, NULL)
#4 /srv/mediawiki/php-master/includes/api/ApiUndelete.php(114): ApiBase->dieWithError(Status)
#5 /srv/mediawiki/php-master/includes/api/ApiMain.php(1898): ApiUndelete->execute()
#6 /srv/mediawiki/php-master/includes/api/ApiMain.php(871): ApiMain->executeAction()
#7 /srv/mediawiki/php-master/includes/api/ApiMain.php(842): ApiMain->executeActionWithErrorHandling()
#8 /srv/mediawiki/php-master/api.php(90): ApiMain->execute()
#9 /srv/mediawiki/php-master/api.php(45): wfApiMain()
#10 /srv/mediawiki/w/api.php(3): require(string)
#11 {main}

I can also reproduce this locally (local docker sqlite), but only when the file has over 1000 archived files.

Locally, I checked out a commit from ~1 month ago (76ce3758bf4b68b695509688b431c8fae1f88072) and I could not reproduce the bug, instead I got the error:

{
    "error": {
        "code": "backend-fail-batchsize",
        "info": "The storage backend was given a batch of 1149 file operations; the limit is 1000 operations.",
        "*": "See http://localhost:8081/w/api.php for API usage. Subscribe to the mediawiki-api-announce mailing list at <https://lists.wikimedia.org/postorius/lists/mediawiki-api-announce.lists.wikimedia.org/> for notice of API deprecations and breaking changes."
    },
    "servedby": "15cefbfe7cc2"
}

I cannot reproduce this on test, for example:

It timed out, but eventually the file was restored. But I haven't tried for files with > 1000 entries.

dmaza added a comment.Apr 1 2022, 3:26 PM
In T290210#7824871, @dom_walden wrote:

@dmaza I am getting an error undeleting some files on beta commons. I think it is related to the number of archived files (entries in filearchive).

Ok. I'll look into it asap. Thanks

Daimona added a comment.Apr 1 2022, 3:28 PM

Uneducated guess by looking at the stack trace: here it should be dieStatus instead of dieWithError

dom_walden added a comment.Apr 1 2022, 3:38 PM

I can also reproduce the error if I am blocked from a namespace I am trying to delete from (but not if I am sitewide blocked).

dmaza added a comment.Apr 1 2022, 7:11 PM
In T290210#7824894, @Daimona wrote:

Uneducated guess by looking at the stack trace: here it should be dieStatus instead of dieWithError

Yes it is. Thank you

gerritbot added a comment.Apr 1 2022, 7:17 PM

Change 776246 had a related patch set uploaded (by Dmaza; author: Dmaza):

[mediawiki/core@master] UndeletePage: Fix api bad method call

https://gerrit.wikimedia.org/r/776246

gerritbot added a project: Patch-For-Review.Apr 1 2022, 7:17 PM
gerritbot added a comment.Apr 1 2022, 8:31 PM

Change 776246 merged by jenkins-bot:

[mediawiki/core@master] ApiUndelete: Fix api bad method call

https://gerrit.wikimedia.org/r/776246

Maintenance_bot removed a project: Patch-For-Review.Apr 1 2022, 9:10 PM
dom_walden moved this task from QA 🐛 to Product sign-off 🤘 on the Community-Tech (CommTech-Sprint-22) board.Apr 6 2022, 8:39 AM

Testing coverage:

  • Restoring articles and files of different sizes (see table)
  • Restoring articles which have already been partially restored
    • incl. the two use cases of merge and split edit histories as described here
  • Concurrency
  • Restoring while passing the fileids and timestamp parameters (as described here)
  • Validation
    • Page is a talk page
    • Page does not have a talk page
  • Trying to restored associated talk page while blocked from talk namespace
  • Monitoring exceptions in logstash
  • If subject page undeletion fails (i.e. it doesn't have deleted revisions), talk page undeletion should be aborted

It is difficult to provoke failures on demand, so this is hard to test. In situations where I can provoke failure deleting the content page (e.g. this file, this file or where the content page is not deleted but the associated talk page is) the associated talk page is not deleted.

  • If restoring the associated talk page fails, restoring the subject page should still happen but with a warning about the talk page failing

Again, hard to provoke failures on demand. In situations where I can (e.g. the associated talk page does not exist or is not deleted) the restoring of the content page is successful and I see a warning about the talk page.

Couple of bugs raised during this testing (I don't think any are blockers):

Test environments: Various versions of https://en.wikipedia.beta.wmflabs.org and https://commons.wikimedia.beta.wmflabs.org.

• NRodriguez closed this task as Resolved.Apr 6 2022, 2:43 PM
• JMcLeod_WMF moved this task from Product sign-off 🤘 to Done 🏁 on the Community-Tech (CommTech-Sprint-22) board.Apr 11 2022, 2:31 PM
Content licensed under Creative Commons Attribution-ShareAlike (CC BY-SA) 4.0 unless otherwise noted; code licensed under GNU General Public License (GPL) 2.0 or later and other open source licenses. By using this site, you agree to the Terms of Use, Privacy Policy, and Code of Conduct. · Wikimedia Foundation · Privacy Policy · Code of Conduct · Terms of Use · Disclaimer · CC-BY-SA · GPL