Skip to content
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.

Sign up for GitHub

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

Jump to bottom

rgw: fix GET website response error code #19236

Merged
merged 1 commit into from Dec 12, 2017
Merged

rgw: fix GET website response error code #19236

merged 1 commit into from Dec 12, 2017

Conversation

dplyakin
Copy link
Contributor

@dplyakin dplyakin commented Nov 29, 2017 •
edited

Change NoSuchKey error code to NoSuchWebsiteConfiguration, when bucket doesn't have website configuration.

Fixes: http://tracker.ceph.com/issues/22272
Signed-off-by: Dmitry Plyakin dplyakin@gmail.com

Backport PRs:
jewel: #19488
luminous: #19489

@dplyakin
Copy link
Contributor Author

jenkins: retest this please

@cbodley
Copy link
Contributor

cbodley commented Nov 29, 2017

thanks 👍

it looks like the s3tests in s3tests/functional/test_s3_website.py will accept either NoSuchKey or NoSuchWebsiteConfiguration, so i don't expect any test failures - but lets confirm with a teuthology run

@yuriw
Copy link
Contributor

yuriw commented Dec 11, 2017 •
edited

@dplyakin @cbodley this PR has conflicts pls rebase

@yuriw yuriw removed the needs-qa label Dec 11, 2017
@dplyakin
Copy link
Contributor Author

@yuriw done. Or should i rebase on master?

@yuriw
Copy link
Contributor

yuriw commented Dec 11, 2017

@dplyakin I could not merge it on master will retry

@yuriw
Copy link
Contributor

yuriw commented Dec 11, 2017

@dplyakin still no go :(

--- pr 19236 --- pulling https://github.com/dplyakin/ceph.git branch get-website-error-code
remote: Counting objects: 5, done.
remote: Total 5 (delta 4), reused 5 (delta 4), pack-reused 0
Unpacking objects: 100% (5/5), done.
From https://github.com/dplyakin/ceph

  • branch get-website-error-code -> FETCH_HEAD
    warning: Failed to merge submodule src/rocksdb (not checked out)
    CONFLICT (rename/add): Rename src/test/ubuntu-12.04/Dockerfile.in->src/test/rbd-ggate.sh in HEAD. src/test/rbd-ggate.sh added in d5f2164
    Adding as src/test/rbd-ggate.sh~d5f21646d92739fce2cdf7764659a28f785e87c0 instead
    Auto-merging src/vstart.sh
    CONFLICT (content): Merge conflict in src/vstart.sh
    Auto-merging src/tracing/librbd.tp
    CONFLICT (content): Merge conflict in src/tracing/librbd.tp
    CONFLICT (modify/delete): src/tools/rbd_mirror/image_sync/ImageCopyRequest.cc deleted in HEAD and modified in d5f2164. Version d5f2164 of src/tools/rbd_mirror/image_sync/ImageCopyRequest.cc left in tree.
    Auto-merging src/tools/rbd_mirror/image_replayer/PrepareRemoteImageRequest.h
    CONFLICT (add/add): Merge conflict in src/tools/rbd_mirror/image_replayer/PrepareRemoteImageRequest.h
    Auto-merging src/tools/rbd_mirror/image_replayer/PrepareRemoteImageRequest.cc
    CONFLICT (add/add): Merge conflict in src/tools/rbd_mirror/image_replayer/PrepareRemoteImageRequest.cc
    Auto-merging src/tools/rbd_mirror/image_replayer/CreateImageRequest.cc
    CONFLICT (content): Merge conflict in src/tools/rbd_mirror/image_replayer/CreateImageRequest.cc
    Auto-merging src/tools/rbd_mirror/image_replayer/BootstrapRequest.h
    CONFLICT (content): Merge conflict in src/tools/rbd_mirror/image_replayer/BootstrapRequest.h
    Auto-merging src/tools/rbd_mirror/image_replayer/BootstrapRequest.cc
    CONFLICT (content): Merge conflict in src/tools/rbd_mirror/image_replayer/BootstrapRequest.cc
    Auto-merging src/tools/rbd_mirror/ImageReplayer.cc
    CONFLICT (content): Merge conflict in src/tools/rbd_mirror/ImageReplayer.cc
    Auto-merging src/tools/rbd_mirror/ImageDeleter.cc
    CONFLICT (content): Merge conflict in src/tools/rbd_mirror/ImageDeleter.cc
    Auto-merging src/tools/rbd/action/List.cc
    CONFLICT (content): Merge conflict in src/tools/rbd/action/List.cc
    Removing src/tools/rbd/action/Group.cc
    Auto-merging src/tools/rbd/CMakeLists.txt
    Auto-merging src/tools/rados/rados.cc
    CONFLICT (content): Merge conflict in src/tools/rados/rados.cc
    Auto-merging src/tools/ceph_osdomap_tool.cc
    CONFLICT (content): Merge conflict in src/tools/ceph_osdomap_tool.cc
    Auto-merging src/tools/ceph_objectstore_tool.cc
    CONFLICT (content): Merge conflict in src/tools/ceph_objectstore_tool.cc
    Auto-merging src/tools/ceph_kvstore_tool.cc
    CONFLICT (content): Merge conflict in src/tools/ceph_kvstore_tool.cc
    Auto-merging src/test/test_ipaddr.cc
    CONFLICT (content): Merge conflict in src/test/test_ipaddr.cc
    Auto-merging src/test/rgw/rgw_multi/tests.py
    CONFLICT (content): Merge conflict in src/test/rgw/rgw_multi/tests.py
    Auto-merging src/test/rbd_mirror/test_mock_ImageReplayer.cc
    CONFLICT (content): Merge conflict in src/test/rbd_mirror/test_mock_ImageReplayer.cc
    Auto-merging src/test/rbd_mirror/image_replayer/test_mock_PrepareRemoteImageRequest.cc
    CONFLICT (add/add): Merge conflict in src/test/rbd_mirror/image_replayer/test_mock_PrepareRemoteImageRequest.cc
    Auto-merging src/test/rbd_mirror/image_replayer/test_mock_BootstrapRequest.cc
    CONFLICT (content): Merge conflict in src/test/rbd_mirror/image_replayer/test_mock_BootstrapRequest.cc
    Auto-merging src/test/rbd_mirror/CMakeLists.txt
    CONFLICT (content): Merge conflict in src/test/rbd_mirror/CMakeLists.txt
    Auto-merging src/test/osd/TestPGLog.cc
    CONFLICT (content): Merge conflict in src/test/osd/TestPGLog.cc
    Auto-merging src/test/osd/TestOSDMap.cc
    CONFLICT (content): Merge conflict in src/test/osd/TestOSDMap.cc
    Auto-merging src/test/librgw_file_marker.cc
    CONFLICT (add/add): Merge conflict in src/test/librgw_file_marker.cc
    Auto-merging src/test/librbd/test_main.cc
    CONFLICT (content): Merge conflict in src/test/librbd/test_main.cc
    Removing src/test/librbd/test_Groups.cc
    Auto-merging src/test/librbd/operation/test_mock_TrimRequest.cc
    CONFLICT (add/add): Merge conflict in src/test/librbd/operation/test_mock_TrimRequest.cc
    Auto-merging src/test/librbd/mock/MockImageCtx.h
    CONFLICT (content): Merge conflict in src/test/librbd/mock/MockImageCtx.h
    Auto-merging src/test/librbd/CMakeLists.txt
    CONFLICT (content): Merge conflict in src/test/librbd/CMakeLists.txt
    Auto-merging src/test/daemon_config.cc
    CONFLICT (content): Merge conflict in src/test/daemon_config.cc
    Auto-merging src/test/cli/rbd/help.t
    CONFLICT (content): Merge conflict in src/test/cli/rbd/help.t
    Auto-merging src/test/CMakeLists.txt
    CONFLICT (content): Merge conflict in src/test/CMakeLists.txt
    Auto-merging src/rocksdb
    CONFLICT (submodule): Merge conflict in src/rocksdb
    Auto-merging src/rgw/rgw_sync.cc
    CONFLICT (content): Merge conflict in src/rgw/rgw_sync.cc
    Auto-merging src/rgw/rgw_rest_swift.cc
    CONFLICT (content): Merge conflict in src/rgw/rgw_rest_swift.cc
    Auto-merging src/rgw/rgw_op.cc
    CONFLICT (content): Merge conflict in src/rgw/rgw_op.cc
    Auto-merging src/rgw/rgw_metadata.h
    CONFLICT (content): Merge conflict in src/rgw/rgw_metadata.h
    Auto-merging src/rgw/rgw_metadata.cc
    CONFLICT (content): Merge conflict in src/rgw/rgw_metadata.cc
    Auto-merging src/rgw/rgw_lc_s3.h
    CONFLICT (content): Merge conflict in src/rgw/rgw_lc_s3.h
    Auto-merging src/rgw/rgw_lc_s3.cc
    CONFLICT (content): Merge conflict in src/rgw/rgw_lc_s3.cc
    Auto-merging src/rgw/rgw_lc.h
    CONFLICT (content): Merge conflict in src/rgw/rgw_lc.h
    Auto-merging src/rgw/rgw_lc.cc
    CONFLICT (content): Merge conflict in src/rgw/rgw_lc.cc
    Auto-merging src/rgw/rgw_iam_policy.cc
    CONFLICT (content): Merge conflict in src/rgw/rgw_iam_policy.cc
    Auto-merging src/rgw/rgw_data_sync.cc
    CONFLICT (content): Merge conflict in src/rgw/rgw_data_sync.cc
    Auto-merging src/rgw/rgw_common.h
    CONFLICT (content): Merge conflict in src/rgw/rgw_common.h
    Auto-merging src/rgw/rgw_asio_frontend.cc
    CONFLICT (content): Merge conflict in src/rgw/rgw_asio_frontend.cc
    Auto-merging src/pybind/mgr/status/module.py
    CONFLICT (content): Merge conflict in src/pybind/mgr/status/module.py
    Auto-merging src/pybind/mgr/prometheus/module.py
    CONFLICT (content): Merge conflict in src/pybind/mgr/prometheus/module.py
    Auto-merging src/pybind/mgr/mgr_module.py
    CONFLICT (content): Merge conflict in src/pybind/mgr/mgr_module.py
    Auto-merging src/pybind/mgr/dashboard/rbd_iscsi.py
    CONFLICT (content): Merge conflict in src/pybind/mgr/dashboard/rbd_iscsi.py
    Auto-merging src/pybind/mgr/dashboard/base.html
    CONFLICT (content): Merge conflict in src/pybind/mgr/dashboard/base.html
    Auto-merging src/pybind/mgr/balancer/module.py
    CONFLICT (add/add): Merge conflict in src/pybind/mgr/balancer/module.py
    Auto-merging src/osd/osd_types.h
    CONFLICT (content): Merge conflict in src/osd/osd_types.h
    Auto-merging src/osd/PrimaryLogPG.cc
    CONFLICT (content): Merge conflict in src/osd/PrimaryLogPG.cc
    Auto-merging src/osd/PGLog.h
    CONFLICT (content): Merge conflict in src/osd/PGLog.h
    Auto-merging src/osd/PGBackend.cc
    CONFLICT (content): Merge conflict in src/osd/PGBackend.cc
    Auto-merging src/osd/PG.h
    CONFLICT (content): Merge conflict in src/osd/PG.h
    Auto-merging src/osd/PG.cc
    CONFLICT (content): Merge conflict in src/osd/PG.cc
    Auto-merging src/osd/OSDMap.h
    CONFLICT (content): Merge conflict in src/osd/OSDMap.h
    Auto-merging src/osd/OSDMap.cc
    CONFLICT (content): Merge conflict in src/osd/OSDMap.cc
    Auto-merging src/osd/OSD.h
    CONFLICT (content): Merge conflict in src/osd/OSD.h
    Auto-merging src/osd/OSD.cc
    CONFLICT (content): Merge conflict in src/osd/OSD.cc
    Auto-merging src/os/bluestore/bluestore_tool.cc
    CONFLICT (content): Merge conflict in src/os/bluestore/bluestore_tool.cc
    Auto-merging src/os/bluestore/aio.cc
    CONFLICT (content): Merge conflict in src/os/bluestore/aio.cc
    Auto-merging src/os/bluestore/StupidAllocator.h
    CONFLICT (content): Merge conflict in src/os/bluestore/StupidAllocator.h
    Auto-merging src/os/bluestore/StupidAllocator.cc
    CONFLICT (content): Merge conflict in src/os/bluestore/StupidAllocator.cc
    Auto-merging src/os/bluestore/KernelDevice.cc
    Auto-merging src/os/bluestore/FreelistManager.h
    Auto-merging src/os/bluestore/BlueStore.cc
    CONFLICT (content): Merge conflict in src/os/bluestore/BlueStore.cc
    Auto-merging src/os/bluestore/BitmapFreelistManager.h
    Auto-merging src/os/bluestore/BitmapFreelistManager.cc
    Auto-merging src/msg/async/PosixStack.cc
    CONFLICT (content): Merge conflict in src/msg/async/PosixStack.cc
    Auto-merging src/mon/PaxosService.h
    CONFLICT (content): Merge conflict in src/mon/PaxosService.h
    Auto-merging src/mon/PGMap.h
    CONFLICT (content): Merge conflict in src/mon/PGMap.h
    Auto-merging src/mon/PGMap.cc
    CONFLICT (content): Merge conflict in src/mon/PGMap.cc
    Auto-merging src/mon/OSDMonitor.cc
    CONFLICT (content): Merge conflict in src/mon/OSDMonitor.cc
    Auto-merging src/mon/Monitor.h
    CONFLICT (content): Merge conflict in src/mon/Monitor.h
    Auto-merging src/mon/Monitor.cc
    CONFLICT (content): Merge conflict in src/mon/Monitor.cc
    Auto-merging src/mon/MonCommands.h
    CONFLICT (content): Merge conflict in src/mon/MonCommands.h
    Auto-merging src/mon/MgrStatMonitor.h
    Auto-merging src/mon/MgrMonitor.h
    CONFLICT (content): Merge conflict in src/mon/MgrMonitor.h
    Auto-merging src/mon/MgrMonitor.cc
    CONFLICT (content): Merge conflict in src/mon/MgrMonitor.cc
    Auto-merging src/mon/MDSMonitor.h
    CONFLICT (content): Merge conflict in src/mon/MDSMonitor.h
    Auto-merging src/mon/MDSMonitor.cc
    CONFLICT (content): Merge conflict in src/mon/MDSMonitor.cc
    Auto-merging src/mon/FSCommands.cc
    CONFLICT (content): Merge conflict in src/mon/FSCommands.cc
    Auto-merging src/mon/Elector.cc
    CONFLICT (content): Merge conflict in src/mon/Elector.cc
    Auto-merging src/mgr/StandbyPyModules.h
    CONFLICT (add/add): Merge conflict in src/mgr/StandbyPyModules.h
    Auto-merging src/mgr/StandbyPyModules.cc
    CONFLICT (add/add): Merge conflict in src/mgr/StandbyPyModules.cc
    Auto-merging src/mgr/PyModuleRunner.h
    CONFLICT (add/add): Merge conflict in src/mgr/PyModuleRunner.h
    Auto-merging src/mgr/PyModuleRunner.cc
    CONFLICT (add/add): Merge conflict in src/mgr/PyModuleRunner.cc
    Auto-merging src/mgr/PyModuleRegistry.h
    CONFLICT (add/add): Merge conflict in src/mgr/PyModuleRegistry.h
    Auto-merging src/mgr/PyModuleRegistry.cc
    CONFLICT (add/add): Merge conflict in src/mgr/PyModuleRegistry.cc
    Auto-merging src/mgr/DaemonServer.cc
    CONFLICT (content): Merge conflict in src/mgr/DaemonServer.cc
    Auto-merging src/mgr/BaseMgrModule.cc
    CONFLICT (add/add): Merge conflict in src/mgr/BaseMgrModule.cc
    Auto-merging src/mgr/ActivePyModules.cc
    CONFLICT (content): Merge conflict in src/mgr/ActivePyModules.cc
    Auto-merging src/mgr/ActivePyModule.h
    CONFLICT (content): Merge conflict in src/mgr/ActivePyModule.h
    Auto-merging src/messages/MOSDPGRecoveryDeleteReply.h
    Auto-merging src/messages/MOSDPGRecoveryDelete.h
    Auto-merging src/messages/MMgrConfigure.h
    CONFLICT (content): Merge conflict in src/messages/MMgrConfigure.h
    Auto-merging src/mds/MDSMap.h
    CONFLICT (content): Merge conflict in src/mds/MDSMap.h
    Auto-merging src/mds/MDSMap.cc
    CONFLICT (content): Merge conflict in src/mds/MDSMap.cc
    Auto-merging src/mds/MDCache.cc
    CONFLICT (content): Merge conflict in src/mds/MDCache.cc
    Auto-merging src/mds/FSMap.h
    CONFLICT (content): Merge conflict in src/mds/FSMap.h
    Auto-merging src/mds/FSMap.cc
    CONFLICT (content): Merge conflict in src/mds/FSMap.cc
    Auto-merging src/librbd/operation/TrimRequest.cc
    CONFLICT (content): Merge conflict in src/librbd/operation/TrimRequest.cc
    Auto-merging src/librbd/librbd.cc
    CONFLICT (content): Merge conflict in src/librbd/librbd.cc
    Auto-merging src/librbd/io/ObjectRequest.h
    CONFLICT (content): Merge conflict in src/librbd/io/ObjectRequest.h
    Auto-merging src/librbd/io/ObjectRequest.cc
    Removing src/librbd/api/Group.h
    Removing src/librbd/api/Group.cc
    Auto-merging src/librbd/ImageCtx.h
    CONFLICT (content): Merge conflict in src/librbd/ImageCtx.h
    Auto-merging src/librbd/ImageCtx.cc
    CONFLICT (content): Merge conflict in src/librbd/ImageCtx.cc
    Auto-merging src/librbd/CMakeLists.txt
    Auto-merging src/kv/LevelDBStore.h
    CONFLICT (content): Merge conflict in src/kv/LevelDBStore.h
    Auto-merging src/include/rbd/librbd.hpp
    Auto-merging src/include/rbd/librbd.h
    CONFLICT (content): Merge conflict in src/include/rbd/librbd.h
    Auto-merging src/include/rados.h
    CONFLICT (content): Merge conflict in src/include/rados.h
    Auto-merging src/include/interval_set.h
    CONFLICT (content): Merge conflict in src/include/interval_set.h
    CONFLICT (modify/delete): src/include/btree_interval_set.h deleted in HEAD and modified in d5f2164. Version d5f2164 of src/include/btree_interval_set.h left in tree.
    Auto-merging src/dmclock/test/CMakeLists.txt
    CONFLICT (content): Merge conflict in src/dmclock/test/CMakeLists.txt
    Auto-merging src/dmclock/sim/src/ssched/ssched_server.h
    CONFLICT (content): Merge conflict in src/dmclock/sim/src/ssched/ssched_server.h
    Auto-merging src/dmclock/cmake/modules/BuildGTest.cmake
    CONFLICT (add/add): Merge conflict in src/dmclock/cmake/modules/BuildGTest.cmake
    Auto-merging src/common/util.cc
    Auto-merging src/common/perf_counters.h
    CONFLICT (content): Merge conflict in src/common/perf_counters.h
    Auto-merging src/common/options.cc
    CONFLICT (content): Merge conflict in src/common/options.cc
    Auto-merging src/common/mClockPriorityQueue.h
    CONFLICT (content): Merge conflict in src/common/mClockPriorityQueue.h
    Auto-merging src/common/legacy_config_opts.h
    CONFLICT (content): Merge conflict in src/common/legacy_config_opts.h
    Auto-merging src/client/fuse_ll.cc
    CONFLICT (content): Merge conflict in src/client/fuse_ll.cc
    Auto-merging src/client/Client.cc
    CONFLICT (content): Merge conflict in src/client/Client.cc
    Auto-merging src/ceph_release
    CONFLICT (content): Merge conflict in src/ceph_release
    Auto-merging src/ceph_osd.cc
    Auto-merging src/ceph-volume/ceph_volume/util/prepare.py
    CONFLICT (content): Merge conflict in src/ceph-volume/ceph_volume/util/prepare.py
    Auto-merging src/ceph-volume/ceph_volume/process.py
    CONFLICT (content): Merge conflict in src/ceph-volume/ceph_volume/process.py
    Auto-merging src/ceph-volume/ceph_volume/devices/lvm/prepare.py
    CONFLICT (content): Merge conflict in src/ceph-volume/ceph_volume/devices/lvm/prepare.py
    Auto-merging src/ceph-volume/ceph_volume/devices/lvm/create.py
    CONFLICT (content): Merge conflict in src/ceph-volume/ceph_volume/devices/lvm/create.py
    Auto-merging src/ceph-volume/ceph_volume/devices/lvm/common.py
    CONFLICT (content): Merge conflict in src/ceph-volume/ceph_volume/devices/lvm/common.py
    Auto-merging src/ceph-volume/ceph_volume/api/lvm.py
    CONFLICT (add/add): Merge conflict in src/ceph-volume/ceph_volume/api/lvm.py
    Auto-merging src/CMakeLists.txt
    CONFLICT (content): Merge conflict in src/CMakeLists.txt
    Auto-merging qa/workunits/rbd/rbd_mirror_helpers.sh
    CONFLICT (content): Merge conflict in qa/workunits/rbd/rbd_mirror_helpers.sh
    Auto-merging qa/workunits/rbd/rbd-ggate.sh
    CONFLICT (add/add): Merge conflict in qa/workunits/rbd/rbd-ggate.sh
    Auto-merging qa/workunits/rados/test_rados_tool.sh
    CONFLICT (content): Merge conflict in qa/workunits/rados/test_rados_tool.sh
    Auto-merging qa/workunits/cephtool/test.sh
    CONFLICT (content): Merge conflict in qa/workunits/cephtool/test.sh
    Auto-merging qa/tasks/thrashosds-health.yaml
    Auto-merging qa/tasks/rbd.py
    CONFLICT (content): Merge conflict in qa/tasks/rbd.py
    Auto-merging qa/tasks/radosgw_admin.py
    CONFLICT (content): Merge conflict in qa/tasks/radosgw_admin.py
    Auto-merging qa/tasks/ceph_deploy.py
    CONFLICT (content): Merge conflict in qa/tasks/ceph_deploy.py
    Auto-merging qa/suites/upgrade/luminous-x/stress-split/2-partial-upgrade/firsthalf.yaml
    CONFLICT (add/add): Merge conflict in qa/suites/upgrade/luminous-x/stress-split/2-partial-upgrade/firsthalf.yaml
    Auto-merging qa/suites/upgrade/luminous-x/stress-split/1-ceph-install/luminous.yaml
    CONFLICT (add/add): Merge conflict in qa/suites/upgrade/luminous-x/stress-split/1-ceph-install/luminous.yaml
    Auto-merging qa/suites/upgrade/luminous-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
    CONFLICT (add/add): Merge conflict in qa/suites/upgrade/luminous-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
    Auto-merging qa/suites/upgrade/luminous-x/parallel/3-upgrade-sequence/upgrade-all.yaml
    CONFLICT (add/add): Merge conflict in qa/suites/upgrade/luminous-x/parallel/3-upgrade-sequence/upgrade-all.yaml
    Auto-merging qa/suites/upgrade/luminous-x/parallel/0-cluster/start.yaml
    CONFLICT (add/add): Merge conflict in qa/suites/upgrade/luminous-x/parallel/0-cluster/start.yaml
    Removing qa/suites/upgrade/kraken-x/parallel/5-final-workload/+
    Auto-merging qa/suites/upgrade/jewel-x/point-to-point-x/point-to-point-upgrade.yaml
    Auto-merging qa/suites/upgrade/jewel-x/parallel/7-final-workload/rbd_import_export.yaml
    Auto-merging qa/suites/upgrade/jewel-x/parallel/7-final-workload/rados_mon_thrash.yaml
    Removing qa/suites/upgrade/jewel-x/parallel/5-final-workload/+
    Auto-merging qa/suites/upgrade/jewel-x/parallel/1-jewel-install/jewel.yaml
    Auto-merging qa/suites/upgrade/jewel-x/parallel/0-cluster/start.yaml
    Auto-merging qa/suites/upgrade/jewel-x/ceph-deploy/jewel-luminous.yaml
    CONFLICT (add/add): Merge conflict in qa/suites/upgrade/jewel-x/ceph-deploy/jewel-luminous.yaml
    Adding qa/suites/rgw/verify/frontend
    Adding qa/suites/rgw/multisite/frontend
    CONFLICT (modify/delete): qa/suites/rados/verify/d-require-luminous deleted in HEAD and modified in d5f2164. Version d5f2164 of qa/suites/rados/verify/d-require-luminous left in tree.
    CONFLICT (modify/delete): qa/suites/rados/upgrade/jewel-x-singleton/1-jewel-install/jewel.yaml deleted in HEAD and modified in d5f2164. Version d5f2164 of qa/suites/rados/upgrade/jewel-x-singleton/1-jewel-install/jewel.yaml left in tree.
    CONFLICT (modify/delete): qa/suites/rados/thrash/d-require-luminous/at-end.yaml deleted in HEAD and modified in d5f2164. Version d5f2164 of qa/suites/rados/thrash/d-require-luminous/at-end.yaml left in tree.
    Auto-merging qa/suites/rados/singleton/all/thrash-eio.yaml
    CONFLICT (content): Merge conflict in qa/suites/rados/singleton/all/thrash-eio.yaml
    Auto-merging qa/suites/rados/singleton/all/recovery-preemption.yaml
    CONFLICT (add/add): Merge conflict in qa/suites/rados/singleton/all/recovery-preemption.yaml
    Auto-merging qa/suites/rados/singleton/all/max-pg-per-osd.from-replica.yaml
    CONFLICT (add/add): Merge conflict in qa/suites/rados/singleton/all/max-pg-per-osd.from-replica.yaml
    Auto-merging qa/suites/rados/singleton/all/max-pg-per-osd.from-primary.yaml
    CONFLICT (add/add): Merge conflict in qa/suites/rados/singleton/all/max-pg-per-osd.from-primary.yaml
    Auto-merging qa/suites/rados/singleton/all/max-pg-per-osd.from-mon.yaml
    CONFLICT (add/add): Merge conflict in qa/suites/rados/singleton/all/max-pg-per-osd.from-mon.yaml
    CONFLICT (modify/delete): qa/suites/rados/monthrash/d-require-luminous deleted in HEAD and modified in d5f2164. Version d5f2164 of qa/suites/rados/monthrash/d-require-luminous left in tree.
    Adding qa/suites/rados/basic/d-require-luminous/at-mkfs.yaml
    Adding qa/suites/rados/basic/d-require-luminous/at-end.yaml
    Auto-merging qa/suites/krbd/singleton/tasks/rbd_xfstests.yaml
    CONFLICT (content): Merge conflict in qa/suites/krbd/singleton/tasks/rbd_xfstests.yaml
    Auto-merging qa/standalone/special/ceph_objectstore_tool.py
    CONFLICT (content): Merge conflict in qa/standalone/special/ceph_objectstore_tool.py
    Auto-merging qa/standalone/scrub/osd-scrub-snaps.sh
    CONFLICT (content): Merge conflict in qa/standalone/scrub/osd-scrub-snaps.sh
    Auto-merging qa/standalone/scrub/osd-scrub-repair.sh
    CONFLICT (content): Merge conflict in qa/standalone/scrub/osd-scrub-repair.sh
    Auto-merging qa/standalone/scrub/osd-recovery-scrub.sh
    CONFLICT (add/add): Merge conflict in qa/standalone/scrub/osd-recovery-scrub.sh
    Auto-merging qa/standalone/erasure-code/test-erasure-eio.sh
    CONFLICT (content): Merge conflict in qa/standalone/erasure-code/test-erasure-eio.sh
    Auto-merging qa/standalone/ceph-helpers.sh
    CONFLICT (content): Merge conflict in qa/standalone/ceph-helpers.sh
    Auto-merging qa/run-standalone.sh
    CONFLICT (content): Merge conflict in qa/run-standalone.sh
    Auto-merging doc/rbd/rbd-mirroring.rst
    Auto-merging doc/rbd/iscsi-requirements.rst
    CONFLICT (add/add): Merge conflict in doc/rbd/iscsi-requirements.rst
    Auto-merging doc/rbd/iscsi-overview.rst
    CONFLICT (add/add): Merge conflict in doc/rbd/iscsi-overview.rst
    Auto-merging doc/rbd/iscsi-monitoring.rst
    CONFLICT (add/add): Merge conflict in doc/rbd/iscsi-monitoring.rst
    Auto-merging doc/rbd/iscsi-initiators.rst
    CONFLICT (add/add): Merge conflict in doc/rbd/iscsi-initiators.rst
    Auto-merging doc/rbd/iscsi-initiator-win.rst
    CONFLICT (add/add): Merge conflict in doc/rbd/iscsi-initiator-win.rst
    Auto-merging doc/rbd/iscsi-initiator-esx.rst
    CONFLICT (add/add): Merge conflict in doc/rbd/iscsi-initiator-esx.rst
    Auto-merging doc/rbd/index.rst
    CONFLICT (content): Merge conflict in doc/rbd/index.rst
    Auto-merging doc/mgr/plugins.rst
    CONFLICT (content): Merge conflict in doc/mgr/plugins.rst
    Auto-merging doc/man/8/ceph.rst
    CONFLICT (content): Merge conflict in doc/man/8/ceph.rst
    Auto-merging doc/man/8/ceph-kvstore-tool.rst
    CONFLICT (add/add): Merge conflict in doc/man/8/ceph-kvstore-tool.rst
    Auto-merging doc/man/8/ceph-bluestore-tool.rst
    CONFLICT (add/add): Merge conflict in doc/man/8/ceph-bluestore-tool.rst
    Auto-merging doc/install/manual-deployment.rst
    CONFLICT (content): Merge conflict in doc/install/manual-deployment.rst
    Auto-merging doc/glossary.rst
    CONFLICT (content): Merge conflict in doc/glossary.rst
    Auto-merging doc/ceph-volume/lvm/prepare.rst
    CONFLICT (add/add): Merge conflict in doc/ceph-volume/lvm/prepare.rst
    Auto-merging doc/ceph-volume/lvm/activate.rst
    CONFLICT (add/add): Merge conflict in doc/ceph-volume/lvm/activate.rst
    Auto-merging doc/ceph-volume/intro.rst
    CONFLICT (add/add): Merge conflict in doc/ceph-volume/intro.rst
    Auto-merging doc/ceph-volume/index.rst
    CONFLICT (add/add): Merge conflict in doc/ceph-volume/index.rst
    Auto-merging debian/rules
    CONFLICT (content): Merge conflict in debian/rules
    Auto-merging ceph.spec.in
    CONFLICT (content): Merge conflict in ceph.spec.in
    Auto-merging PendingReleaseNotes
    CONFLICT (content): Merge conflict in PendingReleaseNotes
    Auto-merging CMakeLists.txt
    CONFLICT (content): Merge conflict in CMakeLists.txt
    Automatic merge failed; fix conflicts and then commit the result.
    Traceback (most recent call last):
    File "src/script/build-integration-branch", line 62, in
    assert not r
    AssertionError

@dplyakin
rgw: fix GET website response error code
56344f0 
Change NoSuchKey error code to NoSuchWebsiteConfiguration, when bucket doesn't have website configuration.

Fixes: http://tracker.ceph.com/issues/22272
Signed-off-by: Dmitry Plyakin <dplyakin@gmail.com>
@dplyakin dplyakin changed the base branch from luminous to master December 11, 2017 17:47
@dplyakin
Copy link
Contributor Author

@yuriw now it should be OK.

@yuriw
Copy link
Contributor

yuriw commented Dec 11, 2017

@dplyakin 👍 yup, passed this one :)

@yuriw yuriw merged commit 0764e7b into ceph:master Dec 12, 2017
This was referenced Dec 13, 2017
Merged
Merged
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
bug-fix needs-qa rgw wip-yuri4-testing
Projects
None yet
Milestone
No milestone
3 participants
@dplyakin @cbodley @yuriw