Skip to content

squid: rgw/multisite: don't retain RGW_ATTR_OBJ_REPLICATION_TRACE attr on copy_object#58763

Merged
cbodley merged 2 commits intoceph:squidfrom
smanjara:wip-67025-squid
Jul 30, 2024
Merged

squid: rgw/multisite: don't retain RGW_ATTR_OBJ_REPLICATION_TRACE attr on copy_object#58763
cbodley merged 2 commits intoceph:squidfrom
smanjara:wip-67025-squid

Conversation

@smanjara
Copy link
Copy Markdown
Contributor

@smanjara smanjara commented Jul 23, 2024

backport tracker: https://tracker.ceph.com/issues/67025

backport of #58519
parent tracker: https://tracker.ceph.com/issues/66983

this backport was staged using ceph-backport.sh version 16.0.0.6848
find the latest version at https://github.com/ceph/ceph/blob/main/src/script/ceph-backport.sh

Shilpa Jagannath added 2 commits July 23, 2024 09:46
rgw/multisite: remove source object's RGW_ATTR_OBJ_REPLICATION_TRACE …
9e546da 
…during copy_object.

if a copy_object is executed on a replicated object, it fails to sync the copied object
to the original source zone where the source object was first written and replicated from.
this is because copy_object retains source attrs by default. when a get_obj() is issued
from a fetch_remote_obj() call during sync, we check for this RGW_ATTR_OBJ_REPLICATION_TRACE
and if that destination zone is already present in the trace, we return NOT_MODIFIED error,
thus failing to replicate the copied object.

also remove RGW_ATTR_OBJ_REPLICATION_STATUS and RGW_ATTR_OBJ_REPLICATION_TIMESTAMP

Signed-off-by: Shilpa Jagannath <smanjara@redhat.com>
(cherry picked from commit 46eef5f)
qa/multisite: add copy_object tests
65c06b3 
Signed-off-by: Shilpa Jagannath <smanjara@redhat.com>
(cherry picked from commit 204101c)
@smanjara smanjara requested a review from a team as a code owner July 23, 2024 16:46
@smanjara smanjara added this to the squid milestone Jul 23, 2024
@smanjara smanjara added the rgw label Jul 23, 2024
@github-actions github-actions bot added the tests label Jul 23, 2024
@smanjara
Copy link
Copy Markdown
Contributor Author

smanjara commented Jul 24, 2024

jenkins test make check

@cbodley cbodley modified the milestones: squid, v19.1.1 Jul 29, 2024
@cbodley
Copy link
Copy Markdown
Contributor

cbodley commented Jul 29, 2024

jenkins test make check

@cbodley
Copy link
Copy Markdown
Contributor

cbodley commented Jul 30, 2024

jenkins test make check

@cbodley
Copy link
Copy Markdown
Contributor

cbodley commented Jul 30, 2024

passed qa in https://pulpito.ceph.com/cbodley-2024-07-29_22:36:09-rgw-wip-cbodley2-testing-distro-default-smithi/

@yuriw
Copy link
Copy Markdown
Contributor

yuriw commented Jul 30, 2024

jenkins test make check

@cbodley
Copy link
Copy Markdown
Contributor

cbodley commented Jul 30, 2024

https://jenkins.ceph.com/job/ceph-pull-requests/140234/

CMake Error at /usr/share/cmake-3.22/Modules/CMakeTestCXXCompiler.cmake

@cbodley
Copy link
Copy Markdown
Contributor

cbodley commented Jul 30, 2024

jenkins test make check

@cbodley
Copy link
Copy Markdown
Contributor

cbodley commented Jul 30, 2024

https://jenkins.ceph.com/job/ceph-pull-requests/140254/

CMake Error at /usr/share/cmake-3.22/Modules/CMakeTestCXXCompiler.cmake

@cbodley
Copy link
Copy Markdown
Contributor

cbodley commented Jul 30, 2024

jenkins test make check

@cbodley
Copy link
Copy Markdown
Contributor

cbodley commented Jul 30, 2024

strange error from https://jenkins.ceph.com/job/ceph-pull-requests/140259/

 -std=c++2b -MD -MT src/crimson/CMakeFiles/crimson-common.dir/__/common/LogEntry.cc.o -MF src/crimson/CMakeFiles/crimson-common.dir/__/common/LogEntry.cc.o.d -o src/crimson/CMakeFiles/crimson-common.dir/__/common/LogEntry.cc.o -c /home/jenkins-build/build/workspace/ceph-pull-requests/src/common/LogEntry.cc
/home/jenkins-build/build/workspace/ceph-pull-requests/src/common/LogEntry.cc:186:14: error: conversion function from 'int' to 'std::string' (aka 'basic_string<char>') invokes a deleted function
      return 0;
             ^
/usr/bin/../lib/gcc/x86_64-linux-gnu/12/../../../../include/c++/12/bits/basic_string.h:742:7: note: 'basic_string' has been explicitly marked deleted here
      basic_string(nullptr_t) = delete;
      ^
1 error generated.

@cbodley
Copy link
Copy Markdown
Contributor

cbodley commented Jul 30, 2024

jenkins test make check

@cbodley
Copy link
Copy Markdown
Contributor

cbodley commented Jul 30, 2024

https://jenkins.ceph.com/job/ceph-pull-requests/140268/

C{++} Error in /home/jenkins-build/build/workspace/ceph-pull-requests/src/common/LogEntry.cc:186:14

https://tracker.ceph.com/issues/67272

@cbodley
Copy link
Copy Markdown
Contributor

cbodley commented Jul 30, 2024

jenkins test make check

@cbodley
Copy link
Copy Markdown
Contributor

cbodley commented Jul 30, 2024

https://jenkins.ceph.com/job/ceph-pull-requests/140281/

C{++} Error in /home/jenkins-build/build/workspace/ceph-pull-requests/src/common/LogEntry.cc:186:14

https://tracker.ceph.com/issues/67272

@cbodley
Copy link
Copy Markdown
Contributor

cbodley commented Jul 30, 2024

jenkins test make check

2 similar comments
@cbodley
Copy link
Copy Markdown
Contributor

cbodley commented Jul 30, 2024

jenkins test make check

@cbodley
Copy link
Copy Markdown
Contributor

cbodley commented Jul 30, 2024

jenkins test make check

@cbodley cbodley merged commit 5b05ded into ceph:squid Jul 30, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@cbodley cbodley cbodley approved these changes

Assignees

No one assigned

Labels

ready-to-merge rgw TESTED tests

Projects

None yet

Milestone

v19.1.1

Development

Successfully merging this pull request may close these issues.

3 participants

@smanjara @cbodley @yuriw