Skip to content

Commit 81e4f72

Browse files
authored
Merge pull request ceph#59580 from smanjara/rgw-data-sync-redundant-retries
rgw/multisite: avoid redundant error repo entry logging Reviewed-by: Adam Emerson <[email protected]>
2 parents 30de906 + a191f9a commit 81e4f72

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

src/rgw/driver/rados/rgw_data_sync.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6052,12 +6052,13 @@ int RGWSyncBucketCR::operate(const DoutPrefixProvider *dpp)
60526052
} else {
60536053
tn->log(20, SSTR("logged prev gen entry (bucket=" << source_bs.bucket << ", shard_id=" << source_bs.shard_id << ", gen=" << current_gen << " in error repo: retcode=" << retcode));
60546054
}
6055-
}
6055+
} else {
60566056
retcode = -EAGAIN;
60576057
tn->log(10, SSTR("ERROR: requested sync of future generation "
60586058
<< *gen << " > " << current_gen
60596059
<< ", returning " << retcode << " for later retry"));
60606060
return set_cr_error(retcode);
6061+
}
60616062
} else if (*gen < current_gen) {
60626063
tn->log(10, SSTR("WARNING: requested sync of past generation "
60636064
<< *gen << " < " << current_gen

0 commit comments

Comments
 (0)