Page MenuHomeSoftware Heritage
Differential D6526

Reorganise the seaweedfs backend in a subpackage
ClosedPublic
Actions

Authored by douardda on Oct 21 2021, 1:07 PM.

Details

Reviewers
vlorentz
Group Reviewers
Reviewers
Commits
rDOBJSbcbbfd466987: Reorganise the seaweedfs backend in a subpackage
Summary

and rename classes for better consistency:

  • move WeedFiler in b/seaweedfs/http.py and rename as HttpFiler
  • move WeedObjStorage in b/seaweedfs/objstorage.py and rename as SeaweedFilerObjStorage.

Depends on D6525

Diff Detail

Event Timeline

douardda created this revision.Oct 21 2021, 1:07 PM
Herald added a reviewer: Reviewers. · View Herald TranscriptOct 21 2021, 1:07 PM
swh-public-ci added a comment.Oct 21 2021, 1:09 PM

Build is green

Patch application report for D6526 (id=23722)

Could not rebase; Attempt merge onto 6269067ca7...

Updating 6269067..9c57a61
Fast-forward
 swh/objstorage/backends/seaweedfs/__init__.py      |   1 +
 swh/objstorage/backends/seaweedfs/http.py          | 102 ++++++++++++++++++++
 .../{seaweed.py => seaweedfs/objstorage.py}        | 104 ++-------------------
 swh/objstorage/factory.py                          |  13 ++-
 swh/objstorage/tests/test_objstorage_seaweedfs.py  |   6 +-
 5 files changed, 123 insertions(+), 103 deletions(-)
 create mode 100644 swh/objstorage/backends/seaweedfs/__init__.py
 create mode 100644 swh/objstorage/backends/seaweedfs/http.py
 rename swh/objstorage/backends/{seaweed.py => seaweedfs/objstorage.py} (59%)
Changes applied before test
commit 9c57a61d016e865a1ea8a83908626c9a22fb2f53
Author: David Douard <david.douard@sdfa3.org>
Date:   Thu Oct 21 09:49:54 2021 +0200

    Reorganise the seaweedfs backend in a subpackage
    
    and rename classes for better consistency:
    
    - move WeedFiler in b/seaweedfs/http.py and rename as HttpFiler
    - move WeedObjStorage in b/seaweedfs/objstorage.py and rename as
      SeaweedFilerObjStorage.

commit 82d9714b0ae5a3687da331c2198010b8d62c8c0b
Author: David Douard <david.douard@sdfa3.org>
Date:   Thu Oct 21 09:58:06 2021 +0200

    Use get_objstorage in seaweedfs tests instead of direct class
    instanciation

commit 38c02dcfae2baa141c7149d5556123fe7341b54b
Author: David Douard <david.douard@sdfa3.org>
Date:   Thu Oct 21 09:55:50 2021 +0200

    Add support for deprecation of objstorage cls in factory
    
    and deprecate "weed" in favor of "seaweedfs".

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

Harbormaster completed remote builds in B24612: Diff 23722.Oct 21 2021, 1:09 PM
douardda requested review of this revision.Oct 21 2021, 1:09 PM
vlorentz accepted this revision.Oct 21 2021, 1:18 PM
vlorentz added a subscriber: vlorentz.
vlorentz added inline comments.
swh/objstorage/backends/seaweedfs/http.py
15

wouldn't this override any configured level if it's imported after the CLI sets it?

99–101
This revision is now accepted and ready to land.Oct 21 2021, 1:18 PM
douardda added inline comments.Oct 21 2021, 1:49 PM
swh/objstorage/backends/seaweedfs/http.py
15

yes sure, ardumont mentioned this yesterday, I need to fix it, thx

99–101

indeed, thx

douardda updated this revision to Diff 23728.Oct 21 2021, 1:53 PM

remove hardcoded log levels

swh-public-ci added a comment.Oct 21 2021, 1:55 PM

Build has FAILED

Patch application report for D6526 (id=23728)

Could not rebase; Attempt merge onto 6269067ca7...

Updating 6269067..0f51945
Fast-forward
 swh/objstorage/backends/seaweedfs/__init__.py      |   1 +
 swh/objstorage/backends/seaweedfs/http.py          | 101 ++++++++++++++++++++
 .../{seaweed.py => seaweedfs/objstorage.py}        | 105 ++-------------------
 swh/objstorage/factory.py                          |  13 ++-
 swh/objstorage/tests/test_objstorage_seaweedfs.py  |   6 +-
 5 files changed, 122 insertions(+), 104 deletions(-)
 create mode 100644 swh/objstorage/backends/seaweedfs/__init__.py
 create mode 100644 swh/objstorage/backends/seaweedfs/http.py
 rename swh/objstorage/backends/{seaweed.py => seaweedfs/objstorage.py} (59%)
Changes applied before test
commit 0f51945d14c70d82b169f79efb8796c8a74489b5
Author: David Douard <david.douard@sdfa3.org>
Date:   Thu Oct 21 09:49:54 2021 +0200

    Reorganise the seaweedfs backend in a subpackage
    
    and rename classes for better consistency:
    
    - move WeedFiler in b/seaweedfs/http.py and rename as HttpFiler
    - move WeedObjStorage in b/seaweedfs/objstorage.py and rename as
      SeaweedFilerObjStorage.

commit 82d9714b0ae5a3687da331c2198010b8d62c8c0b
Author: David Douard <david.douard@sdfa3.org>
Date:   Thu Oct 21 09:58:06 2021 +0200

    Use get_objstorage in seaweedfs tests instead of direct class
    instanciation

commit 38c02dcfae2baa141c7149d5556123fe7341b54b
Author: David Douard <david.douard@sdfa3.org>
Date:   Thu Oct 21 09:55:50 2021 +0200

    Add support for deprecation of objstorage cls in factory
    
    and deprecate "weed" in favor of "seaweedfs".

Link to build: https://jenkins.softwareheritage.org/job/DOBJS/job/tests-on-diff/61/
See console output for more information: https://jenkins.softwareheritage.org/job/DOBJS/job/tests-on-diff/61/console

Harbormaster failed remote builds in B24617: Diff 23728!Oct 21 2021, 1:56 PM
douardda updated this revision to Diff 23729.Oct 21 2021, 2:03 PM

and fix the LOGGER.error usage

swh-public-ci added a comment.Oct 21 2021, 2:05 PM

Build is green

Patch application report for D6526 (id=23729)

Could not rebase; Attempt merge onto 6269067ca7...

Updating 6269067..bcbbfd4
Fast-forward
 swh/objstorage/backends/seaweedfs/__init__.py      |   1 +
 swh/objstorage/backends/seaweedfs/http.py          | 101 ++++++++++++++++++++
 .../{seaweed.py => seaweedfs/objstorage.py}        | 105 ++-------------------
 swh/objstorage/factory.py                          |  13 ++-
 swh/objstorage/tests/test_objstorage_seaweedfs.py  |   6 +-
 5 files changed, 122 insertions(+), 104 deletions(-)
 create mode 100644 swh/objstorage/backends/seaweedfs/__init__.py
 create mode 100644 swh/objstorage/backends/seaweedfs/http.py
 rename swh/objstorage/backends/{seaweed.py => seaweedfs/objstorage.py} (59%)
Changes applied before test
commit bcbbfd466987179d2f130d7da637e5de11b0dfd2
Author: David Douard <david.douard@sdfa3.org>
Date:   Thu Oct 21 09:49:54 2021 +0200

    Reorganise the seaweedfs backend in a subpackage
    
    and rename classes for better consistency:
    
    - move WeedFiler in b/seaweedfs/http.py and rename as HttpFiler
    - move WeedObjStorage in b/seaweedfs/objstorage.py and rename as
      SeaweedFilerObjStorage.

commit 82d9714b0ae5a3687da331c2198010b8d62c8c0b
Author: David Douard <david.douard@sdfa3.org>
Date:   Thu Oct 21 09:58:06 2021 +0200

    Use get_objstorage in seaweedfs tests instead of direct class
    instanciation

commit 38c02dcfae2baa141c7149d5556123fe7341b54b
Author: David Douard <david.douard@sdfa3.org>
Date:   Thu Oct 21 09:55:50 2021 +0200

    Add support for deprecation of objstorage cls in factory
    
    and deprecate "weed" in favor of "seaweedfs".

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

Harbormaster completed remote builds in B24618: Diff 23729.Oct 21 2021, 2:05 PM
douardda marked 2 inline comments as done.Oct 21 2021, 2:06 PM
Closed by commit rDOBJSbcbbfd466987: Reorganise the seaweedfs backend in a subpackage (authored by douardda). · Explain WhyOct 21 2021, 2:06 PM
This revision was automatically updated to reflect the committed changes.
douardda added a commit: rDOBJSbcbbfd466987: Reorganise the seaweedfs backend in a subpackage.

Revision Contents
Changeset List

PathSizeCoverage (All)Coverage (Touched)
swh/
objstorage/
backends/
--
seaweedfs/
1 line100%
Loading...
101 lines93%
Loading...
seaweedfs/
objstorage.py
seaweed.py
105 lines89%
Loading...
4 lines75%
Loading...

Diff 23729

View Options

swh/objstorage/backends/seaweed.py

Loading...
View Options

swh/objstorage/backends/seaweedfs/__init__.py

Loading...
View Options

swh/objstorage/backends/seaweedfs/http.py

Loading...
View Options

swh/objstorage/backends/seaweedfs/objstorage.py

Loading...
View Options

swh/objstorage/factory.py

Loading...
About · Developer information · Legal