diff options
| author | Yehuda Sadeh <yehuda@inktank.com> | 2013-06-06 18:50:27 -0700 |
|---|---|---|
| committer | Yehuda Sadeh <yehuda@inktank.com> | 2013-06-10 14:28:03 -0700 |
| commit | bf6b80c67765d08f669a6e51eafb6758e1adff1a (patch) | |
| tree | 4eeab647c79822840baadc0896750e1dda351080 | |
| parent | 2237086d15c6b9b1366388ac9ac2cbda51de83b6 (diff) | |
| download | ceph-bf6b80c67765d08f669a6e51eafb6758e1adff1a.tar.gz | |
rgw: fix logic related to operations on different region
Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
| -rw-r--r-- | src/rgw/rgw_op.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc index f2e97d19810..d540fd605be 100644 --- a/src/rgw/rgw_op.cc +++ b/src/rgw/rgw_op.cc @@ -316,8 +316,8 @@ static int rgw_build_policies(RGWRados *store, struct req_state *s, bool only_bu s->bucket_owner = s->bucket_acl->get_owner(); string& region = bucket_info.region; - if (exists && (region.empty() && !store->region.is_master) && - (region != store->region.name)) { + if (exists && ((region.empty() && !store->region.is_master) || + (region != store->region.name))) { ldout(s->cct, 0) << "NOTICE: request for data in a different region (" << region << " != " << store->region.name << ")" << dendl; return -ERR_PERMANENT_REDIRECT; } |