Fix race condition in multiplexer_objstorage add() return value
ClosedPublic
Actions

Authored by olasd on Jun 5 2020, 6:41 PM.

Details

Reviewers

Commits

rDOBJSdc1e38b6dc50: Fix race condition in multiplexer_objstorage add() return value

Summary

If an objstorage is read-only, the add() method will return None. The
multiplexer should return one of the non-None values if it finds one, instead of
the (inconsistent) first value returned by any of the threads.

Test Plan

tox is happy, even by making add() slow (e.g. by adding a sleep(1) to
it)

Diff Detail

Repository

rDOBJS Object storage

Lint

Automatic diff as part of commit; lint not applicable.

Unit

Automatic diff as part of commit; unit tests not applicable.

Event Timeline

olasd created this revision.Jun 5 2020, 6:41 PM

Build is green

Patch application report for D3237 (id=11480)

Rebasing onto 15358e9c2a...

Current branch diff-target is up to date.

Changes applied before test

commit dc1e38b6dc50bc715b2fd4c035edfaa51135f417
Author: Nicolas Dandrimont <nicolas@dandrimont.eu>
Date:   Fri Jun 5 18:40:02 2020 +0200

    Fix race condition in multiplexer_objstorage add() return value
    
    If an objstorage is read-only, the add() method will return None. The
    multiplexer should return one of the non-None values if it finds one, instead of
    the (inconsistent) first value returned by any of the threads.

See https://jenkins.softwareheritage.org/job/DOBJS/job/tests-on-diff/13/ for more details.

Harbormaster completed remote builds in B12685: Diff 11480.Jun 5 2020, 6:44 PM

douardda accepted this revision.Jun 5 2020, 6:44 PM

This revision is now accepted and ready to land.Jun 5 2020, 6:44 PM

Closed by commit rDOBJSdc1e38b6dc50: Fix race condition in multiplexer_objstorage add() return value (authored by olasd). · Explain WhyJun 5 2020, 6:47 PM

This revision was automatically updated to reflect the committed changes.

olasd added a commit: rDOBJSdc1e38b6dc50: Fix race condition in multiplexer_objstorage add() return value.