New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rgw: fix broken /crossdomain.xml, /info and /healthcheck of Swift API. #14373

Merged
merged 1 commit into from May 4, 2017

Conversation

Projects
None yet
2 participants
@rzarzynski
Contributor

rzarzynski commented Apr 6, 2017

Fixes: http://tracker.ceph.com/issues/19520
Signed-off-by: Radoslaw Zarzynski rzarzynski@mirantis.com

Show outdated Hide outdated src/rgw/rgw_op.cc
@@ -374,8 +374,13 @@ int rgw_build_bucket_policies(RGWRados* store, struct req_state* s)
if(s->dialect.compare("s3") == 0) {
s->bucket_acl = new RGWAccessControlPolicy_S3(s->cct);
} else if(s->dialect.compare("swift") == 0) {
s->user_acl = std::unique_ptr<RGWAccessControlPolicy>(
new RGWAccessControlPolicy_SWIFTAcct(s->cct));
/* We aren'tallocating the account policy for those operations using

This comment has been minimized.

@yehudasa

yehudasa Apr 6, 2017

Member

missing a space here at the comment

@yehudasa

yehudasa Apr 6, 2017

Member

missing a space here at the comment

This comment has been minimized.

@rzarzynski

rzarzynski Apr 6, 2017

Contributor

Fixed.

@rzarzynski

rzarzynski Apr 6, 2017

Contributor

Fixed.

@yehudasa

minor comment

rgw: fix broken /crossdomain.xml, /info and /healthcheck of Swift API.
Fixes: http://tracker.ceph.com/issues/19520
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
@yehudasa

This comment has been minimized.

Show comment
Hide comment
@yehudasa

yehudasa Apr 20, 2017

Member

@rzarzynski how did you test it?

Member

yehudasa commented Apr 20, 2017

@rzarzynski how did you test it?

@rzarzynski

This comment has been minimized.

Show comment
Hide comment
@rzarzynski

rzarzynski Apr 25, 2017

Contributor

@yehudasa: I've locally verified the branch using Tempest and s3-tests. Neither of them has found any regression.

Additionally, Tempest confirmed the slash features became operational:

$ ./run_tempest.sh -V "tempest.api.object_storage.test_crossdomain.CrossdomainTest.test_get_crossdomain_policy|tempest.api.object_storage.test_healthcheck.HealthcheckTest.test_get_healthcheck|tempest.api.object_storage.test_account_services.AccountTest.test_list_extensions"
WARNING: This script is deprecated and will be removed in the near future. Please migrate to tempest run or another method of launching a test runner
running=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \
OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} \
OS_TEST_TIMEOUT=${OS_TEST_TIMEOUT:-500} \
OS_TEST_LOCK_PATH=${OS_TEST_LOCK_PATH:-${TMPDIR:-'/tmp'}} \
${PYTHON:-python} -m subunit.run discover -t ${OS_TOP_LEVEL:-./} ${OS_TEST_PATH:-./tempest/test_discover} --list 
running=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \
OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} \
OS_TEST_TIMEOUT=${OS_TEST_TIMEOUT:-500} \
OS_TEST_LOCK_PATH=${OS_TEST_LOCK_PATH:-${TMPDIR:-'/tmp'}} \
${PYTHON:-python} -m subunit.run discover -t ${OS_TOP_LEVEL:-./} ${OS_TEST_PATH:-./tempest/test_discover}  --load-list /tmp/tmpfFAnTb
running=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \
OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} \
OS_TEST_TIMEOUT=${OS_TEST_TIMEOUT:-500} \
OS_TEST_LOCK_PATH=${OS_TEST_LOCK_PATH:-${TMPDIR:-'/tmp'}} \
${PYTHON:-python} -m subunit.run discover -t ${OS_TOP_LEVEL:-./} ${OS_TEST_PATH:-./tempest/test_discover}  --load-list /tmp/tmp_3lTEt
running=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \
OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} \
OS_TEST_TIMEOUT=${OS_TEST_TIMEOUT:-500} \
OS_TEST_LOCK_PATH=${OS_TEST_LOCK_PATH:-${TMPDIR:-'/tmp'}} \
${PYTHON:-python} -m subunit.run discover -t ${OS_TOP_LEVEL:-./} ${OS_TEST_PATH:-./tempest/test_discover}  --load-list /tmp/tmp8zwzup
{0} tempest.api.object_storage.test_healthcheck.HealthcheckTest.test_get_healthcheck [0.004530s] ... ok
{1} tempest.api.object_storage.test_crossdomain.CrossdomainTest.test_get_crossdomain_policy [0.004683s] ... ok
{2} tempest.api.object_storage.test_account_services.AccountTest.test_list_extensions [0.002800s] ... ok

======
Totals
======
Ran: 3 tests in 4.0000 sec.
 - Passed: 3
 - Skipped: 0
 - Expected Fail: 0
 - Unexpected Success: 0
 - Failed: 0
Sum of execute time for each test: 0.0120 sec.

==============
Worker Balance
==============
 - Worker 0 (1 tests) => 0:00:00.004530
 - Worker 1 (1 tests) => 0:00:00.004683
 - Worker 2 (1 tests) => 0:00:00.002800
Contributor

rzarzynski commented Apr 25, 2017

@yehudasa: I've locally verified the branch using Tempest and s3-tests. Neither of them has found any regression.

Additionally, Tempest confirmed the slash features became operational:

$ ./run_tempest.sh -V "tempest.api.object_storage.test_crossdomain.CrossdomainTest.test_get_crossdomain_policy|tempest.api.object_storage.test_healthcheck.HealthcheckTest.test_get_healthcheck|tempest.api.object_storage.test_account_services.AccountTest.test_list_extensions"
WARNING: This script is deprecated and will be removed in the near future. Please migrate to tempest run or another method of launching a test runner
running=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \
OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} \
OS_TEST_TIMEOUT=${OS_TEST_TIMEOUT:-500} \
OS_TEST_LOCK_PATH=${OS_TEST_LOCK_PATH:-${TMPDIR:-'/tmp'}} \
${PYTHON:-python} -m subunit.run discover -t ${OS_TOP_LEVEL:-./} ${OS_TEST_PATH:-./tempest/test_discover} --list 
running=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \
OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} \
OS_TEST_TIMEOUT=${OS_TEST_TIMEOUT:-500} \
OS_TEST_LOCK_PATH=${OS_TEST_LOCK_PATH:-${TMPDIR:-'/tmp'}} \
${PYTHON:-python} -m subunit.run discover -t ${OS_TOP_LEVEL:-./} ${OS_TEST_PATH:-./tempest/test_discover}  --load-list /tmp/tmpfFAnTb
running=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \
OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} \
OS_TEST_TIMEOUT=${OS_TEST_TIMEOUT:-500} \
OS_TEST_LOCK_PATH=${OS_TEST_LOCK_PATH:-${TMPDIR:-'/tmp'}} \
${PYTHON:-python} -m subunit.run discover -t ${OS_TOP_LEVEL:-./} ${OS_TEST_PATH:-./tempest/test_discover}  --load-list /tmp/tmp_3lTEt
running=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \
OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} \
OS_TEST_TIMEOUT=${OS_TEST_TIMEOUT:-500} \
OS_TEST_LOCK_PATH=${OS_TEST_LOCK_PATH:-${TMPDIR:-'/tmp'}} \
${PYTHON:-python} -m subunit.run discover -t ${OS_TOP_LEVEL:-./} ${OS_TEST_PATH:-./tempest/test_discover}  --load-list /tmp/tmp8zwzup
{0} tempest.api.object_storage.test_healthcheck.HealthcheckTest.test_get_healthcheck [0.004530s] ... ok
{1} tempest.api.object_storage.test_crossdomain.CrossdomainTest.test_get_crossdomain_policy [0.004683s] ... ok
{2} tempest.api.object_storage.test_account_services.AccountTest.test_list_extensions [0.002800s] ... ok

======
Totals
======
Ran: 3 tests in 4.0000 sec.
 - Passed: 3
 - Skipped: 0
 - Expected Fail: 0
 - Unexpected Success: 0
 - Failed: 0
Sum of execute time for each test: 0.0120 sec.

==============
Worker Balance
==============
 - Worker 0 (1 tests) => 0:00:00.004530
 - Worker 1 (1 tests) => 0:00:00.004683
 - Worker 2 (1 tests) => 0:00:00.002800
@rzarzynski

This comment has been minimized.

Show comment
Hide comment
@rzarzynski

rzarzynski May 1, 2017

Contributor

@yehudasa: this branch has been tested in following Teuthology runs:

The results look good. The failures have been caused by the well-known strange leak of std::string memory from md_config_t seen in radosgw signalised by Valgrind by Valgrind signalising a non-related leak outside of RadosGW (mons).

Contributor

rzarzynski commented May 1, 2017

@yehudasa: this branch has been tested in following Teuthology runs:

The results look good. The failures have been caused by the well-known strange leak of std::string memory from md_config_t seen in radosgw signalised by Valgrind by Valgrind signalising a non-related leak outside of RadosGW (mons).

@yehudasa yehudasa merged commit 77a4357 into ceph:master May 4, 2017

3 checks passed

Signed-off-by all commits in this PR are signed
Details
Unmodifed Submodules submodules for project are unmodified
Details
default Build finished.
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment