Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
R
rwm
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Radoslav Bodó
rwm
Commits
973c4eb9
Commit
973c4eb9
authored
1 year ago
by
Radoslav Bodó
Browse files
Options
Downloads
Patches
Plain Diff
rwm: add storage-state command
parent
016de09e
No related branches found
No related tags found
No related merge requests found
Pipeline
#7777
passed
1 year ago
Stage: code_quality
Changes
4
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
rwm.py
+18
-2
18 additions, 2 deletions
rwm.py
tests/test_default.py
+3
-0
3 additions, 0 deletions
tests/test_default.py
tests/test_rwm.py
+13
-0
13 additions, 0 deletions
tests/test_rwm.py
tests/test_storage.py
+20
-1
20 additions, 1 deletion
tests/test_storage.py
with
54 additions
and
3 deletions
rwm.py
+
18
−
2
View file @
973c4eb9
...
...
@@ -462,7 +462,7 @@ class StorageManager:
return
ret
def
_bucket
_state
(
self
,
bucket_name
):
def
storage
_state
(
self
,
bucket_name
):
"""
dumps current bucket state into dict
"""
state
=
{
...
...
@@ -488,7 +488,7 @@ class StorageManager:
# explicit error handling here, it's used during backup process
try
:
bucket_state
=
self
.
_bucket
_state
(
bucket_name
)
bucket_state
=
self
.
storage
_state
(
bucket_name
)
now
=
datetime
.
now
().
astimezone
().
isoformat
()
self
.
s3
.
Bucket
(
bucket_name
).
upload_fileobj
(
BytesIO
(
gzip
.
compress
(
json
.
dumps
(
bucket_state
,
cls
=
RwmJSONEncoder
).
encode
())),
...
...
@@ -741,6 +741,16 @@ class RWM:
return
0
def
storage_state
(
self
,
bucket_name
)
->
int
:
"""
dump storage state in json
"""
print
(
json
.
dumps
(
self
.
storage_manager
.
storage_state
(
bucket_name
),
indent
=
4
,
cls
=
RwmJSONEncoder
))
return
0
def
storage_drop_versions
(
self
,
bucket_name
)
->
int
:
"""
storage_drop_versions command
"""
...
...
@@ -799,6 +809,9 @@ def parse_arguments(argv):
storage_info_cmd_parser
=
subparsers
.
add_parser
(
"
storage-info
"
,
help
=
"
show detailed storage info
"
)
storage_info_cmd_parser
.
add_argument
(
"
bucket_name
"
,
help
=
"
bucket name
"
)
storage_state_cmd_parser
=
subparsers
.
add_parser
(
"
storage-state
"
,
help
=
"
dump current storage state
"
)
storage_state_cmd_parser
.
add_argument
(
"
bucket_name
"
,
help
=
"
bucket name
"
)
storage_drop_versions_cmd_parser
=
subparsers
.
add_parser
(
"
storage-drop-versions
"
,
help
=
"
reclaim storage space; drop any old object versions from bucket
"
...
...
@@ -873,6 +886,9 @@ def main(argv=None): # pylint: disable=too-many-branches
if
args
.
command
==
"
storage-info
"
:
ret
=
rwmi
.
storage_info
(
args
.
bucket_name
)
if
args
.
command
==
"
storage-state
"
:
ret
=
rwmi
.
storage_state
(
args
.
bucket_name
)
if
args
.
command
==
"
storage-drop-versions
"
:
ret
=
rwmi
.
storage_drop_versions
(
args
.
bucket_name
)
...
...
This diff is collapsed.
Click to expand it.
tests/test_default.py
+
3
−
0
View file @
973c4eb9
...
...
@@ -65,6 +65,9 @@ def test_main():
with
patch
.
object
(
rwm
.
RWM
,
"
storage_info
"
,
mock_ok
):
assert
_rwm_minconfig
([
"
storage-info
"
,
"
dummy
"
])
==
0
with
patch
.
object
(
rwm
.
RWM
,
"
storage_state
"
,
mock_ok
):
assert
_rwm_minconfig
([
"
storage-state
"
,
"
dummy
"
])
==
0
with
patch
.
object
(
rwm
.
RWM
,
"
storage_drop_versions
"
,
mock_ok
):
assert
_rwm_minconfig
([
"
storage-drop-versions
"
,
"
bucket
"
])
==
0
...
...
This diff is collapsed.
Click to expand it.
tests/test_rwm.py
+
13
−
0
View file @
973c4eb9
...
...
@@ -328,6 +328,19 @@ def test_storage_info(tmpworkdir: str, radosuser_admin: rwm.StorageManager): #
assert
trwm
.
storage_info
(
"
dummy
"
)
==
0
def
test_storage_state
(
tmpworkdir
:
str
,
radosuser_admin
:
rwm
.
StorageManager
):
# pylint: disable=unused-argument
"""
test storage_state
"""
trwm
=
rwm
.
RWM
({
"
s3_endpoint_url
"
:
radosuser_admin
.
url
,
"
s3_access_key
"
:
radosuser_admin
.
access_key
,
"
s3_secret_key
"
:
radosuser_admin
.
secret_key
,
})
trwm
.
storage_create
(
"
dummy
"
,
"
dummy
"
)
assert
trwm
.
storage_state
(
"
dummy
"
)
==
0
def
test_storage_drop_versions
(
tmpworkdir
:
str
):
# pylint: disable=unused-argument
"""
test storage drop versions
"""
...
...
This diff is collapsed.
Click to expand it.
tests/test_storage.py
+
20
−
1
View file @
973c4eb9
...
...
@@ -178,6 +178,25 @@ def test_storage_info(
assert
radosuser_admin
.
storage_info
(
bucket_name
)[
"
delete_markers
"
]
==
1
def
test_storage_state
(
tmpworkdir
:
str
,
radosuser_admin
:
rwm
.
StorageManager
,
):
# pylint: disable=unused-argument
"""
test manager storage state
"""
bucket_name
=
"
rwmbackup-test1
"
target_username
=
"
test1
"
bucket
=
radosuser_admin
.
storage_create
(
bucket_name
,
target_username
)
bucket
.
upload_fileobj
(
BytesIO
(
b
"
dummydata1
"
),
"
dummykey
"
)
bucket
.
upload_fileobj
(
BytesIO
(
b
"
dummydata1
"
),
"
dummykey1
"
)
bucket
.
Object
(
"
dummykey1
"
).
delete
()
state
=
radosuser_admin
.
storage_state
(
bucket_name
)
assert
len
(
state
[
"
versions
"
])
==
2
assert
len
(
state
[
"
delete_markers
"
])
==
1
def
test_storage_drop_versions
(
tmpworkdir
:
str
,
radosuser_admin
:
rwm
.
StorageManager
):
# pylint: disable=unused-argument
"""
test manager storage_drop_versions
"""
...
...
@@ -230,7 +249,7 @@ def test_storage_save_state_error_handling(tmpworkdir: str): # pylint: disable=
"""
test storage_save_state error handling
"""
mock
=
Mock
(
side_effect
=
TypeError
(
"
dummy
"
))
with
patch
.
object
(
rwm
.
StorageManager
,
"
_bucket
_state
"
,
mock
):
with
patch
.
object
(
rwm
.
StorageManager
,
"
storage
_state
"
,
mock
):
assert
rwm
.
StorageManager
(
"
http://localhost
"
,
""
,
""
).
storage_save_state
(
"
dummy
"
)
==
1
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment