[rgw][tentacle] Add Restore support from Glacier/Tape cloud endpoints by soumyakoduri · Pull Request #64360 · ceph/ceph

soumyakoduri · 2025-07-06T18:32:49Z

This is backport of below PRs, which adds Restore support for Glacier/Tape endpoints.

#62713
#64361

Fixes: https://tracker.ceph.com/issues/72015
Signed-off-by: Soumya Koduri skoduri@redhat.com

Checklist

Tracker (select at least one)
- References tracker ticket
- Very recent bug; references commit where it was introduced
- New feature (ticket optional)
- Doc update (no ticket needed)
- Code cleanup (no ticket needed)
Component impact
- Affects Dashboard, opened tracker ticket
- Affects Orchestrator, opened tracker ticket
- No impact that needs to be tracked
Documentation (select at least one)
- Updates relevant documentation
- No doc update is appropriate
Tests (select at least one)
- Includes unit test(s)
- Includes integration test(s)
- Includes bug reproducer
- No tests

Show available Jenkins commands

jenkins test classic perf Jenkins Job | Jenkins Job Definition
jenkins test crimson perf Jenkins Job | Jenkins Job Definition
jenkins test signed Jenkins Job | Jenkins Job Definition
jenkins test make check Jenkins Job | Jenkins Job Definition
jenkins test make check arm64 Jenkins Job | Jenkins Job Definition
jenkins test submodules Jenkins Job | Jenkins Job Definition
jenkins test dashboard Jenkins Job | Jenkins Job Definition
jenkins test dashboard cephadm Jenkins Job | Jenkins Job Definition
jenkins test api Jenkins Job | Jenkins Job Definition
jenkins test docs ReadTheDocs | Github Workflow Definition
jenkins test ceph-volume all Jenkins Jobs | Jenkins Jobs Definition
jenkins test windows Jenkins Job | Jenkins Job Definition
jenkins test rook e2e Jenkins Job | Jenkins Job Definition

cbodley · 2025-07-07T14:49:00Z

is #62713 ready to merge to main?

edit: it merged

soumyakoduri · 2025-07-08T06:22:32Z

jenkins test api

soumyakoduri · 2025-07-08T12:37:23Z

teuthology results - http://pulpito.front.sepia.ceph.com/soumyakoduri-2025-07-08_11:10:02-rgw-wip-skoduri-tentacle-distro-default-smithi/detail
http://pulpito.front.sepia.ceph.com/soumyakoduri-2025-07-08_11:07:14-rgw:cloud-transition-wip-skoduri-tentacle-distro-default-smithi

The failures reported in few tests seem to be due to missing modules and unrelated to this PR

cbodley · 2025-07-08T12:47:16Z

The failures reported in few tests seem to be due to missing modules and unrelated to this PR

i agree that they're unrelated, but they prevented lots of other tests from running after. could you please --rerun?

soumyakoduri · 2025-07-08T16:44:30Z

The failures reported in few tests seem to be due to missing modules and unrelated to this PR

i agree that they're unrelated, but they prevented lots of other tests from running after. could you please --rerun?

Sure!

soumyakoduri · 2025-07-09T04:52:47Z

http://pulpito.front.sepia.ceph.com/soumyakoduri-2025-07-08_16:44:58-rgw-wip-skoduri-tentacle-distro-default-smithi/

…cier/Tape endpoint Restoration of objects from certain cloud services (like Glacier/Tape) could take significant amount of time (even days). Hence store the state of such restore requests and periodically process them. Brief summary of changes * Refactored existing restore code to consolidate and move all restore processing into rgw_restore* file/class * RGWRestore class is defined to manage the restoration of objects. * Lastly, for SAL_RADOS, FIFO is used to store and read restore entries. Currently, this PR handles storing state of restore requests sent to cloud-glacier tier-type which need async processing. The changes are tested with AWS Glacier Flexible Retrieval with tier_type Expedited and Standard. Reviewed-by: Matt Benjamin <mbenjamin@redhat.com> Reviewed-by: Adam Emerson <aemerson@redhat.com> Reviewed-by: Jiffin Tony Thottan <thottanjiffin@gmail.com> Reviewed-by: Daniel Gryniewicz <dang@redhat.com> Signed-off-by: Soumya Koduri <skoduri@redhat.com> (cherry picked from commit ef96bb0)

In case adding restore entry to FIFO fails, reset the `restore_status` of that object as "RestoreFailed" so that restore process can be retried from the end S3 user. Reviewed-by: Adam Emerson <aemerson@redhat.com> Reviewed-by: Jiffin Tony Thottan <thottanjiffin@gmail.com> Signed-off-by: Soumya Koduri <skoduri@redhat.com> (cherry picked from commit 9974f51)

In addition, added some more debug statements and done code cleanup Reviewed-by: Adam Emerson <aemerson@redhat.com> Reviewed-by: Jiffin Tony Thottan <thottanjiffin@gmail.com> Signed-off-by: Soumya Koduri <skoduri@redhat.com> (cherry picked from commit f00ac7c)

Reviewed-by: Adam Emerson <aemerson@redhat.com> Reviewed-by: Matt Benjamin <mbenjamin@redhat.com> Signed-off-by: Soumya Koduri <skoduri@redhat.com> (cherry picked from commit b3c867a)

cbodley · 2025-07-10T20:11:43Z

from https://jenkins.ceph.com/job/ceph-api/99806/

src/rgw/driver/rados/rgw_sal_rados.h:961:15: error: 'unlock' marked 'override' but does not override any member functions
  961 |   virtual int unlock(const DoutPrefixProvider* dpp, optional_yield y) override;
      |               ^
src/rgw/driver/rados/rgw_sal_rados.h:961:15: error: 'rgw::sal::RadosRestoreSerializer::unlock' hides overloaded virtual function [-Werror,-Woverloaded-virtual]
src/rgw/rgw_sal.h:1578:15: note: hidden overloaded virtual function 'rgw::sal::Serializer::unlock' declared here: different number of parameters (0 vs 2)
 1578 |   virtual int unlock()  = 0;
      |               ^

Use new neorados/FIFO routines to store restore state. Note: Old librados ioctx is also still retained as it is needed by RestoreRadosSerializer. Signed-off-by: Soumya Koduri <skoduri@redhat.com> (cherry picked from commit faf06bc)

Signed-off-by: Soumya Koduri <skoduri@redhat.com> (cherry picked from commit a981b4c)

Fix the version of `restore_pool` and `dedup_pool` to be compatible with earlier releases. Signed-off-by: Soumya Koduri <skoduri@redhat.com> (cherry picked from commit b6fc0be)

soumyakoduri · 2025-07-11T14:33:48Z

from https://jenkins.ceph.com/job/ceph-api/99806/

src/rgw/driver/rados/rgw_sal_rados.h:961:15: error: 'unlock' marked 'override' but does not override any member functions
  961 |   virtual int unlock(const DoutPrefixProvider* dpp, optional_yield y) override;
      |               ^
src/rgw/driver/rados/rgw_sal_rados.h:961:15: error: 'rgw::sal::RadosRestoreSerializer::unlock' hides overloaded virtual function [-Werror,-Woverloaded-virtual]
src/rgw/rgw_sal.h:1578:15: note: hidden overloaded virtual function 'rgw::sal::Serializer::unlock' declared here: different number of parameters (0 vs 2)
 1578 |   virtual int unlock()  = 0;
      |               ^

I have addressed the conflicts and also ran cloud-transition/restore tests for sanity check -
http://pulpito.front.sepia.ceph.com/soumyakoduri-2025-07-11_06:57:40-rgw:cloud-transition-wip-skoduri-tentacle-distro-default-smithi

I guess this is now ready to be merged.

soumyakoduri requested review from a team as code owners July 6, 2025 18:32

github-actions bot added build/ops common documentation rgw tests labels Jul 6, 2025

github-actions bot added this to the tentacle milestone Jul 6, 2025

soumyakoduri requested review from adamemerson and cbodley July 6, 2025 18:41

soumyakoduri mentioned this pull request Jul 6, 2025

rgw/cloud-restore [PART2] : Add Restore support from Glacier/Tape cloud endpoints #62713

Merged

14 tasks

soumyakoduri force-pushed the wip-skoduri-tentacle branch from 607aff7 to 8564d8a Compare July 7, 2025 09:42

soumyakoduri force-pushed the wip-skoduri-tentacle branch from 8564d8a to f07c9fb Compare July 7, 2025 18:27

soumyakoduri added 4 commits July 10, 2025 22:09

rgw/restore: Use strtoull to read size till 2^64

87ce61d

Reviewed-by: Adam Emerson <aemerson@redhat.com> Reviewed-by: Matt Benjamin <mbenjamin@redhat.com> Signed-off-by: Soumya Koduri <skoduri@redhat.com> (cherry picked from commit b3c867a)

soumyakoduri force-pushed the wip-skoduri-tentacle branch from f07c9fb to 7502b8c Compare July 10, 2025 16:42

cbodley approved these changes Jul 10, 2025

View reviewed changes

cbodley added the ready-to-merge label Jul 10, 2025

soumyakoduri added 3 commits July 11, 2025 08:38

rgw/restore: Update to neorados FIFO routines

6a9ac3a

Use new neorados/FIFO routines to store restore state. Note: Old librados ioctx is also still retained as it is needed by RestoreRadosSerializer. Signed-off-by: Soumya Koduri <skoduri@redhat.com> (cherry picked from commit faf06bc)

rgw/cloud-restore: Update doc with new options added

818c856

Signed-off-by: Soumya Koduri <skoduri@redhat.com> (cherry picked from commit a981b4c)

rgw: Fix the version of struct RGWZoneParams

dc123a7

Fix the version of `restore_pool` and `dedup_pool` to be compatible with earlier releases. Signed-off-by: Soumya Koduri <skoduri@redhat.com> (cherry picked from commit b6fc0be)

soumyakoduri force-pushed the wip-skoduri-tentacle branch from 7502b8c to dc123a7 Compare July 11, 2025 03:09

cbodley merged commit fd8429a into ceph:tentacle Jul 11, 2025
11 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[rgw][tentacle] Add Restore support from Glacier/Tape cloud endpoints#64360

[rgw][tentacle] Add Restore support from Glacier/Tape cloud endpoints#64360
cbodley merged 7 commits intoceph:tentaclefrom
soumyakoduri:wip-skoduri-tentacle

soumyakoduri commented Jul 6, 2025 •

edited

Loading

Uh oh!

cbodley commented Jul 7, 2025 •

edited

Loading

Uh oh!

soumyakoduri commented Jul 8, 2025

Uh oh!

soumyakoduri commented Jul 8, 2025

Uh oh!

cbodley commented Jul 8, 2025

Uh oh!

soumyakoduri commented Jul 8, 2025

Uh oh!

soumyakoduri commented Jul 9, 2025

Uh oh!

cbodley commented Jul 10, 2025

Uh oh!

soumyakoduri commented Jul 11, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

soumyakoduri commented Jul 6, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Checklist

Uh oh!

cbodley commented Jul 7, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

soumyakoduri commented Jul 8, 2025

Uh oh!

soumyakoduri commented Jul 8, 2025

Uh oh!

cbodley commented Jul 8, 2025

Uh oh!

soumyakoduri commented Jul 8, 2025

Uh oh!

soumyakoduri commented Jul 9, 2025

Uh oh!

cbodley commented Jul 10, 2025

Uh oh!

soumyakoduri commented Jul 11, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

soumyakoduri commented Jul 6, 2025 •

edited

Loading

cbodley commented Jul 7, 2025 •

edited

Loading