Merge pull request #11471 from dachary/wip-17511-jewel

jewel: s3tests-test-readwrite failing with 500 Reviewed-by: Casey Bodley <cbodley@redhat.com>
ceph · Oct 20, 2016 · f6d7290 · f6d7290
2 parents 9e9a38d + 40689d1
commit f6d7290
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc
@@ -3558,6 +3558,9 @@ void RGWPutACLs::execute()
     attrs[RGW_ATTR_ACL] = bl;
     op_ret = rgw_bucket_set_attrs(store, s->bucket_info, attrs, &s->bucket_info.objv_tracker);
   }
+  if (op_ret == -ECANCELED) {
+    op_ret = 0; /* lost a race, but it's ok because acls are immutable */
+  }
 }
 
 int RGWGetCORS::verify_permission()