]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
6 years agoos/bluestore: dump onode meta before "no spanning blob" assertion. 28029/head
Igor Fedotov [Wed, 1 May 2019 22:27:43 +0000 (01:27 +0300)]
os/bluestore: dump onode meta before "no spanning blob" assertion.

Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit 4464419dde0f22ad0d5a636bf3992c28ff357ef6)

 Conflicts:
src/os/bluestore/BlueStore.cc
 Trivial

6 years agoos/bluestore: move _dump_xxx methods out of BlueStore class
Igor Fedotov [Wed, 1 May 2019 13:47:20 +0000 (16:47 +0300)]
os/bluestore: move _dump_xxx methods out of BlueStore class

Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit 70640aaa12540057df9ac86d4336cdce81f10f07)

 Conflicts:
src/os/bluestore/BlueStore.cc
 Trivial.

6 years agoMerge pull request #27972 from smithfarm/wip-37348-mimic
Casey Bodley [Tue, 7 May 2019 18:47:59 +0000 (14:47 -0400)]
Merge pull request #27972 from smithfarm/wip-37348-mimic

mimic: rgw: when using nfs-ganesha to upload file, rgw es sync module get failed

Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
6 years agoMerge pull request #27948 from smithfarm/wip-37498-mimic
Yuri Weinstein [Tue, 7 May 2019 15:44:51 +0000 (08:44 -0700)]
Merge pull request #27948 from smithfarm/wip-37498-mimic

mimic: rgw: get or set realm zonegroup zone should check user's caps for security

Reviewed-by: Casey Bodley <cbodley@redhat.com>
6 years agoMerge pull request #27356 from pdvian/wip-38922-mimic
Yuri Weinstein [Mon, 6 May 2019 16:28:21 +0000 (09:28 -0700)]
Merge pull request #27356 from pdvian/wip-38922-mimic

mimic: rgw: Fix S3 compatibility bug when CORS is not found

Reviewed-by: Casey Bodley <cbodley@redhat.com>
6 years agoMerge pull request #27367 from pdvian/wip-38924-mimic
Yuri Weinstein [Mon, 6 May 2019 16:27:53 +0000 (09:27 -0700)]
Merge pull request #27367 from pdvian/wip-38924-mimic

mimic: rgw: Adding tcp_nodelay option to Beast

Reviewed-by: Casey Bodley <cbodley@redhat.com>
6 years agoMerge pull request #27421 from pdvian/wip-38959-mimic
Yuri Weinstein [Mon, 6 May 2019 16:27:31 +0000 (09:27 -0700)]
Merge pull request #27421 from pdvian/wip-38959-mimic

mimic: rgw-admin: fix data sync report for master zone

Reviewed-by: Casey Bodley <cbodley@redhat.com>
6 years agoMerge pull request #27603 from pdvian/wip-39017-mimic
Yuri Weinstein [Mon, 6 May 2019 16:27:05 +0000 (09:27 -0700)]
Merge pull request #27603 from pdvian/wip-39017-mimic

mimic: rgw admin: add tenant argument to reshard cancel

Reviewed-by: Casey Bodley <cbodley@redhat.com>
6 years agoMerge pull request #27661 from pdvian/wip-39049-mimic
Yuri Weinstein [Mon, 6 May 2019 16:26:36 +0000 (09:26 -0700)]
Merge pull request #27661 from pdvian/wip-39049-mimic

mimic: rgw: beast: set a default port for endpoints

Reviewed-by: Casey Bodley <cbodley@redhat.com>
6 years agoMerge pull request #27666 from smithfarm/wip-39359-mimic
Yuri Weinstein [Mon, 6 May 2019 16:26:04 +0000 (09:26 -0700)]
Merge pull request #27666 from smithfarm/wip-39359-mimic

mimic: rgw: failed to pass test_bucket_create_naming_bad_punctuation in s3test

Reviewed-by: Casey Bodley <cbodley@redhat.com>
6 years agoMerge pull request #27796 from cbodley/wip-38713
Yuri Weinstein [Mon, 6 May 2019 16:23:01 +0000 (09:23 -0700)]
Merge pull request #27796 from cbodley/wip-38713

mimic: rgw: resolve bugs and clean up garbage collection code

Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>
6 years agoMerge pull request #27828 from ashishkumsingh/wip-39498-mimic
Yuri Weinstein [Mon, 6 May 2019 16:22:32 +0000 (09:22 -0700)]
Merge pull request #27828 from ashishkumsingh/wip-39498-mimic

mimic: rgw: admin: handle delete_at attr in object stat output

Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
6 years agoMerge pull request #26140 from ashishkumsingh/wip-37909-mimic
Yuri Weinstein [Mon, 6 May 2019 16:18:24 +0000 (09:18 -0700)]
Merge pull request #26140 from ashishkumsingh/wip-37909-mimic

mimic: rbd_mirror: don't report error if image replay canceled

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
6 years agoMerge pull request #27391 from pdvian/wip-38955-mimic
Yuri Weinstein [Mon, 6 May 2019 16:17:57 +0000 (09:17 -0700)]
Merge pull request #27391 from pdvian/wip-38955-mimic

mimic: tests: krbd discard qa fixes

Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
6 years agoMerge pull request #27588 from pdvian/wip-38976-mimic
Yuri Weinstein [Mon, 6 May 2019 16:17:22 +0000 (09:17 -0700)]
Merge pull request #27588 from pdvian/wip-38976-mimic

mimic: rbd: krbd: return -ETIMEDOUT in polling

Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
6 years agoMerge pull request #27958 from dillaman/wip-39585-mimic
Yuri Weinstein [Mon, 6 May 2019 16:16:48 +0000 (09:16 -0700)]
Merge pull request #27958 from dillaman/wip-39585-mimic

mimic: qa/tasks/rbd_fio: fixed missing delimiter between 'cd' and 'configure'

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
6 years agoMerge pull request #27959 from dillaman/wip-39583-mimic
Yuri Weinstein [Mon, 6 May 2019 16:16:20 +0000 (09:16 -0700)]
Merge pull request #27959 from dillaman/wip-39583-mimic

mimic: qa/workunits/rbd: use more recent qemu-iotests that support Bionic

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
6 years agoMerge pull request #26655 from jan--f/c-v-simple-activate-all-mimic
Alfredo Deza [Mon, 6 May 2019 15:15:21 +0000 (11:15 -0400)]
Merge pull request #26655 from jan--f/c-v-simple-activate-all-mimic

mimic: ceph-volume: add --all flag to simple activate

Reviewed-by: Alfredo Deza <adeza@redhat.com>
6 years agorgw: ES sync: wrap all the decode bls in try block 27972/head
Abhishek Lekshmanan [Tue, 9 Oct 2018 11:52:22 +0000 (13:52 +0200)]
rgw: ES sync: wrap all the decode bls in try block

since decode can throw, wrap all the try block

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit 12b12ccea23871688cc4101c72f00b0575f1c01a)

Conflicts:
src/rgw/rgw_sync_module_es.cc
- mimic uses val.begin() where master has val.cbegin()

6 years agoMerge pull request #26194 from pdvian/wip-38078-mimic
Yuri Weinstein [Fri, 3 May 2019 21:55:46 +0000 (14:55 -0700)]
Merge pull request #26194 from pdvian/wip-38078-mimic

mimic: multisite: bucket full sync does not handle delete markers

Reviewed-by: Casey Bodley <cbodley@redhat.com>
6 years agoMerge pull request #26553 from pdvian/wip-38396-mimic
Yuri Weinstein [Fri, 3 May 2019 21:55:15 +0000 (14:55 -0700)]
Merge pull request #26553 from pdvian/wip-38396-mimic

mimic: rgw: when exclusive lock fails due existing lock, log add'l info

Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>
6 years agoMerge pull request #26615 from pdvian/wip-38413-mimic
Yuri Weinstein [Fri, 3 May 2019 21:54:42 +0000 (14:54 -0700)]
Merge pull request #26615 from pdvian/wip-38413-mimic

mimic: multisite: rgw_data_sync_status json decode failure breaks automated datalog trimming

Reviewed-by: Casey Bodley <cbodley@redhat.com>
6 years agoMerge pull request #27122 from smithfarm/wip-38886-mimic
Yuri Weinstein [Fri, 3 May 2019 21:54:15 +0000 (14:54 -0700)]
Merge pull request #27122 from smithfarm/wip-38886-mimic

mimic: rgw: GetBucketCORS API returns Not Found error code when CORS configuration does not exist

Reviewed-by: Casey Bodley <cbodley@redhat.com>
6 years agoMerge pull request #27304 from pdvian/wip-38907-mimic
Yuri Weinstein [Fri, 3 May 2019 21:53:50 +0000 (14:53 -0700)]
Merge pull request #27304 from pdvian/wip-38907-mimic

mimic: rgw: fix read not exists null version return wrong

Reviewed-by: Casey Bodley <cbodley@redhat.com>
6 years agoMerge pull request #27335 from liaoxin01/mimic
Yuri Weinstein [Fri, 3 May 2019 21:53:00 +0000 (14:53 -0700)]
Merge pull request #27335 from liaoxin01/mimic

mimic: rgw: fix bug of apply default quota, for this create new a user may core using beast

Reviewed-by: Casey Bodley <cbodley@redhat.com>
6 years agoMerge pull request #27354 from pdvian/wip-38919-mimic
Yuri Weinstein [Fri, 3 May 2019 21:52:31 +0000 (14:52 -0700)]
Merge pull request #27354 from pdvian/wip-38919-mimic

mimic: rgw: don't crash on missing /etc/mime.types

Reviewed-by: Casey Bodley <cbodley@redhat.com>
6 years agoMerge pull request #26792 from cbodley/wip-38609
Yuri Weinstein [Fri, 3 May 2019 21:51:58 +0000 (14:51 -0700)]
Merge pull request #26792 from cbodley/wip-38609

mimic: qa/rgw: reduce number of multisite log shards

Reviewed-by: Ali Maredia <amaredia@redhat.com>
6 years agoMerge pull request #26670 from tspmelo/wip-npm-update-mimic
Yuri Weinstein [Fri, 3 May 2019 19:53:20 +0000 (12:53 -0700)]
Merge pull request #26670 from tspmelo/wip-npm-update-mimic

mimic: mgr/dashboard: Update npm packages

Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
6 years agoMerge pull request #27638 from tchaikov/mimic-39132
Yuri Weinstein [Fri, 3 May 2019 19:51:47 +0000 (12:51 -0700)]
Merge pull request #27638 from tchaikov/mimic-39132

mimic: mgr: enable inter-module calls

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
6 years agoqa/workunits/rbd: use more recent qemu-iotests that support Bionic 27959/head
Jason Dillaman [Thu, 18 Apr 2019 18:02:45 +0000 (14:02 -0400)]
qa/workunits/rbd: use more recent qemu-iotests that support Bionic

Fixes: http://tracker.ceph.com/issues/24668
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit b184acd218b36b85f5a25678d773c35407a2b745)

6 years agoqa/tasks/rbd_fio: fixed missing delimiter between 'cd' and 'configure' 27958/head
Jason Dillaman [Thu, 18 Apr 2019 12:55:19 +0000 (08:55 -0400)]
qa/tasks/rbd_fio: fixed missing delimiter between 'cd' and 'configure'

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 83c11efb98f28c19f70eac04a6a84fe820f968cb)

6 years agoqa/rgw: add credentials to zone 'remove' in test_zonegroup_remove() 27948/head
Casey Bodley [Wed, 28 Nov 2018 18:18:05 +0000 (13:18 -0500)]
qa/rgw: add credentials to zone 'remove' in test_zonegroup_remove()

zone credentials are required to 'period update --commit' from
--rgw-zone remove

Signed-off-by: Casey Bodley <cbodley@redhat.com>
Conflicts:
src/test/rgw/rgw_multi/tests.py
(cherry picked from commit 56021eab9584f10fa43053621cce93b623c36265)

6 years agorgw: get or set realm zonegroup zone need check user's caps
yuliyang [Tue, 20 Nov 2018 09:19:38 +0000 (17:19 +0800)]
rgw: get or set realm zonegroup zone need check user's caps

fix: https://tracker.ceph.com/issues/37352

Signed-off-by: yuliyang <yuliyang@cmss.chinamobile.com>
(cherry picked from commit 6ecaec926fb81810f6be43744cd5c48d6ccfaf5a)

Conflicts:
src/rgw/rgw_rest_config.h
src/rgw/rgw_rest_realm.cc
- mimic lacks "override" in some places

6 years agoMerge pull request #27451 from badone/wip-mimic-spdk-rte_table_hash_cuckoo_create...
Brad Hubbard [Thu, 2 May 2019 22:31:26 +0000 (08:31 +1000)]
Merge pull request #27451 from badone/wip-mimic-spdk-rte_table_hash_cuckoo_create-build-error

mimic: spdk: update to latest spdk-18.05 branch

Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge pull request #26495 from pdvian/wip-38337-mimic
Yuri Weinstein [Thu, 2 May 2019 22:21:08 +0000 (15:21 -0700)]
Merge pull request #26495 from pdvian/wip-38337-mimic

mimic: test: run-standalone.sh set local library location so mgr can find li…

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: David Zafman <dzafman@redhat.com>
6 years agoMerge pull request #26777 from pdvian/wip-38532-mimic
Yuri Weinstein [Thu, 2 May 2019 22:20:15 +0000 (15:20 -0700)]
Merge pull request #26777 from pdvian/wip-38532-mimic

mimic: mgr/PyModule: put mgr_module_path first in sys.path

Reviewed-by: Tim Serong <tserong@suse.com>
6 years agoMerge pull request #26811 from ashishkumsingh/wip-38565-mimic
Yuri Weinstein [Thu, 2 May 2019 22:18:35 +0000 (15:18 -0700)]
Merge pull request #26811 from ashishkumsingh/wip-38565-mimic

mimic: run-standalone.sh: Need double-quotes to handle | in core_pattern on all distributions

Reviewed-by: David Zafman <dzafman@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
6 years agoMerge pull request #27860 from ashishkumsingh/wip-39464-mimic
Yuri Weinstein [Thu, 2 May 2019 22:16:44 +0000 (15:16 -0700)]
Merge pull request #27860 from ashishkumsingh/wip-39464-mimic

mimic: msg: output peer address when detecting bad CRCs

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
6 years agoMerge pull request #26709 from pdvian/wip-38507-mimic
Yuri Weinstein [Thu, 2 May 2019 22:15:11 +0000 (15:15 -0700)]
Merge pull request #26709 from pdvian/wip-38507-mimic

mimic: osd/PrimaryLogPG: handle object !exists in handle_watch_timeout

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
6 years agoMerge pull request #26760 from pdvian/wip-38511-mimic
Yuri Weinstein [Thu, 2 May 2019 22:14:30 +0000 (15:14 -0700)]
Merge pull request #26760 from pdvian/wip-38511-mimic

mimic: CLI: ability to change file ownership

Reviewed-by: Neha Ojha <nojha@redhat.com>
6 years agoMerge pull request #26810 from ashishkumsingh/wip-38587-mimic
Yuri Weinstein [Thu, 2 May 2019 22:09:59 +0000 (15:09 -0700)]
Merge pull request #26810 from ashishkumsingh/wip-38587-mimic

mimic: common/str_map: fix trim() on empty string

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
6 years agoMerge pull request #26833 from pdvian/wip-38561-mimic
Yuri Weinstein [Thu, 2 May 2019 22:09:10 +0000 (15:09 -0700)]
Merge pull request #26833 from pdvian/wip-38561-mimic

mimic: mgr/BaseMgrModule: drop GIL for ceph_send_command

Reviewed-by: Tim Serong <tserong@suse.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
6 years agoMerge pull request #26862 from ashishkumsingh/wip-38646-mimic
Yuri Weinstein [Thu, 2 May 2019 22:07:58 +0000 (15:07 -0700)]
Merge pull request #26862 from ashishkumsingh/wip-38646-mimic

mimic: osd: fixup OpTracker destruct assert, waiting_for_osdmap take ref      with OpRequest

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
6 years agoMerge pull request #27078 from yuriw/wip-yuriw-clients-mimic_2
Yuri Weinstein [Wed, 1 May 2019 23:39:23 +0000 (16:39 -0700)]
Merge pull request #27078 from yuriw/wip-yuriw-clients-mimic_2

qa/tests: initial checkin for `client-upgrade-mimic` suite

6 years agoqa/tests: removed conflicting tests rbd_api_tests and rbd_import_export 27078/head
Yuri Weinstein [Mon, 29 Apr 2019 21:34:01 +0000 (14:34 -0700)]
qa/tests: removed conflicting tests rbd_api_tests and rbd_import_export
and added devstack-tempest-gate.yaml instead

Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
6 years agoMerge pull request #27447 from ifed01/wip-ifed-fix-39144
Yuri Weinstein [Wed, 1 May 2019 15:57:44 +0000 (08:57 -0700)]
Merge pull request #27447 from ifed01/wip-ifed-fix-39144

mimic: os/bluestore_tool: bluefs-bdev-expand: indicate bypassed for main dev

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
6 years agoMerge pull request #27558 from tspmelo/wip-26986-mimic
Yuri Weinstein [Wed, 1 May 2019 15:57:19 +0000 (08:57 -0700)]
Merge pull request #27558 from tspmelo/wip-26986-mimic

mimic: mgr/dashboard: Use human readable units on the OSD I/O graphs

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
6 years agoMerge pull request #27587 from pdvian/wip-38972-mimic
Yuri Weinstein [Wed, 1 May 2019 15:56:56 +0000 (08:56 -0700)]
Merge pull request #27587 from pdvian/wip-38972-mimic

mimic: osd: process_copy_chunk remove obc ref before pg unlock

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
6 years agoMerge pull request #27366 from ifed01/wip-ifed-fix-alloc-overflow-mimic
Yuri Weinstein [Wed, 1 May 2019 15:52:06 +0000 (08:52 -0700)]
Merge pull request #27366 from ifed01/wip-ifed-fix-alloc-overflow-mimic

mimic: os/bluestore: fix length overflow.

Reviewed-by: Jianpeng Ma <jianpeng.ma@intel.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
6 years agoMerge pull request #27570 from ifed01/wip-ifed-fix-21312-mimic
Yuri Weinstein [Wed, 1 May 2019 15:50:11 +0000 (08:50 -0700)]
Merge pull request #27570 from ifed01/wip-ifed-fix-21312-mimic

mimic: os/bluestore: call fault_range properly prior to looking for blob to …

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
6 years agoMerge pull request #27629 from pdvian/wip-39044-mimic
Yuri Weinstein [Wed, 1 May 2019 15:48:35 +0000 (08:48 -0700)]
Merge pull request #27629 from pdvian/wip-39044-mimic

mimic: osd/PGLog: preserve original_crt to check rollbackability

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
6 years agoMerge pull request #27635 from smithfarm/wip-39342-mimic
Yuri Weinstein [Wed, 1 May 2019 15:47:39 +0000 (08:47 -0700)]
Merge pull request #27635 from smithfarm/wip-39342-mimic

mimic: ceph-objectstore-tool: rename dump-import to dump-export

Reviewed-by: David Zafman <dzafman@redhat.com>
6 years agoMerge pull request #27647 from smithfarm/wip-39353-mimic
Yuri Weinstein [Wed, 1 May 2019 15:46:50 +0000 (08:46 -0700)]
Merge pull request #27647 from smithfarm/wip-39353-mimic

mimic: mon/OSDMonitor: further improve prepare_command_pool_set E2BIG error message

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
6 years agoMerge pull request #27738 from ifed01/wip-ifed-fix-39445
Yuri Weinstein [Wed, 1 May 2019 15:46:11 +0000 (08:46 -0700)]
Merge pull request #27738 from ifed01/wip-ifed-fix-39445

mimic: os/bluestore: fix out-of-bound access in bmap allocator.

Reviewed-by: Sage Weil <sage@redhat.com>
6 years agoMerge pull request #27745 from ashishkumsingh/wip-39433-mimic
Yuri Weinstein [Wed, 1 May 2019 15:45:22 +0000 (08:45 -0700)]
Merge pull request #27745 from ashishkumsingh/wip-39433-mimic

mimic: osd/PG: discover missing objects when an OSD peers and PG is degraded

Reviewed-by: Neha Ojha <nojha@redhat.com>
6 years agoMerge pull request #27747 from s0nea/wip-39347-mimic
Yuri Weinstein [Wed, 1 May 2019 15:44:31 +0000 (08:44 -0700)]
Merge pull request #27747 from s0nea/wip-39347-mimic

mimic: mgr/dashboard: Manager should complain about wrong dashboard certificate

Reviewed-by: Volker Theile <vtheile@suse.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge pull request #27845 from mykaul/patch-1
Kefu Chai [Wed, 1 May 2019 04:56:14 +0000 (12:56 +0800)]
Merge pull request #27845 from mykaul/patch-1

doc: Update bluestore config docs - fix typo (as -> has)

Reviewed-by: Igor Fedotov <ifedotov@suse.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agodoc/rados: Update bluestore config - fix typo 27845/head
Yaniv Kaul [Mon, 29 Apr 2019 09:35:28 +0000 (12:35 +0300)]
doc/rados: Update bluestore config - fix typo

as -> has

Signed-off-by: Yaniv Kaul <ykaul@redhat.com>
6 years agomgr/dashboard: Add package-lock.json and use "npm ci" 26670/head
Tiago Melo [Thu, 7 Mar 2019 23:22:13 +0000 (22:22 -0100)]
mgr/dashboard: Add package-lock.json and use "npm ci"

This will make sure that in the future we always install the same version
of every npm package.

Since we don't use the same npm packages anymore, it's not possible to backport
this changes from master to mimic.

Fixes: http://tracker.ceph.com/issues/39080
Signed-off-by: Tiago Melo <tmelo@suse.com>
6 years agomgr/dashboard: Update npm packages
Tiago Melo [Wed, 27 Feb 2019 11:39:52 +0000 (11:39 +0000)]
mgr/dashboard: Update npm packages

Fix some npm packages vulnerabilities.

Since we don't use the same npm packages anymore, it's not possible to backport
this changes from master to mimic.

Fixes: http://tracker.ceph.com/issues/39080
Signed-off-by: Tiago Melo <tmelo@suse.com>
6 years agoMerge pull request #26643 from pdvian/wip-38448-mimic
Yuri Weinstein [Mon, 29 Apr 2019 16:43:22 +0000 (09:43 -0700)]
Merge pull request #26643 from pdvian/wip-38448-mimic

mimic: MDSMonitor: do not assign standby-replay when degraded

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Venky Shankar <vshankar@redhat.com>
6 years agoMerge pull request #26804 from pdvian/wip-38542-mimic
Yuri Weinstein [Mon, 29 Apr 2019 16:42:50 +0000 (09:42 -0700)]
Merge pull request #26804 from pdvian/wip-38542-mimic

mimic: qa: unmount clients before deleting fs

Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agoMerge pull request #26807 from pdvian/wip-38544-mimic
Yuri Weinstein [Mon, 29 Apr 2019 16:42:19 +0000 (09:42 -0700)]
Merge pull request #26807 from pdvian/wip-38544-mimic

mimic: qa: remove libcephfs-java tests

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Venky Shankar <vshankar@redhat.com>
6 years agoMerge pull request #26963 from ashishkumsingh/wip-38734-mimic
Yuri Weinstein [Mon, 29 Apr 2019 16:41:46 +0000 (09:41 -0700)]
Merge pull request #26963 from ashishkumsingh/wip-38734-mimic

mimic: qa: extend MDS heartbeat grace for valgrind

Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agoMerge pull request #27023 from pdvian/wip-38670-mimic
Yuri Weinstein [Mon, 29 Apr 2019 16:41:12 +0000 (09:41 -0700)]
Merge pull request #27023 from pdvian/wip-38670-mimic

mimic: mds: wait for client to release shared cap when re-acquiring xlock

Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Yan, Zheng <zyan@redhat.com>
6 years agoMerge pull request #27058 from pdvian/wip-38689-mimic
Yuri Weinstein [Mon, 29 Apr 2019 16:40:36 +0000 (09:40 -0700)]
Merge pull request #27058 from pdvian/wip-38689-mimic

mimic: mds: inode filtering on 'dump cache' asok

Reviewed-by: Venky Shankar <vshankar@redhat.com>
6 years agorgw: resolve bugs and clean up garbage collection code 27796/head
J. Eric Ivancich [Fri, 15 Feb 2019 01:30:46 +0000 (20:30 -0500)]
rgw: resolve bugs and clean up garbage collection code

Does a number of things to clean up rgw gc code:

  * adds additional logging to make future debugging easier.
  * resolves bug where the truncated flag was not always set correctly
    in gc_iterate_entries
  * resolves bug where marker in RGWGC::process was not advanced
  * resolves bug in which gc entries with a zero-length chain
    were not trimmed
  * resolves bug where same gc entry tag was added to list for
    deletion multiple times

Fixes: http://tracker.ceph.com/issues/38454
Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
(cherry picked from commit 73d7d369a2cc5edc8d51d70e02420e6efbfbe297)

Conflicts:
src/rgw/rgw_gc.cc dout() vs ldpp_dout()

6 years agomsg: output peer address when detecting bad CRCs 27860/head
Greg Farnum [Wed, 17 Apr 2019 22:27:22 +0000 (15:27 -0700)]
msg: output peer address when detecting bad CRCs

Fixes: http://tracker.ceph.com/issues/39367
Signed-off-by: Greg Farnum <gfarnum@redhat.com>
(cherry picked from commit 19679231fc32daa405cc060847a02ac1cfd51300)

6 years agorgw: admin: handle delete_at attr in object stat output 27828/head
Abhishek Lekshmanan [Thu, 25 Apr 2019 12:13:33 +0000 (14:13 +0200)]
rgw: admin: handle delete_at attr in object stat output

Fixes: https://tracker.ceph.com/issues/39481
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit 90999a4de8e21551a98e0fe28acbadc158a7bc65)

6 years agocmake: update BuildSPDK for spdk-18.05 27451/head
Kefu Chai [Thu, 14 Jun 2018 01:32:08 +0000 (09:32 +0800)]
cmake: update BuildSPDK for spdk-18.05

in spdk v18.05, libuuid is linked by libspdk_util.a, in which,
it is used by lib/util/uuid.c. and libspdk_vol.a uses the wrapper
function exposed by libspdk_util.a, so update the CMakefile script to
reflect the change.

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit c2026b7473173e021c1f5ee072828538ea5c5d61)

6 years agomgr/dashboard: .pylintrc: ignore too-many-statements check 27747/head
Ricardo Dias [Fri, 15 Jun 2018 08:04:11 +0000 (09:04 +0100)]
mgr/dashboard: .pylintrc: ignore too-many-statements check

Signed-off-by: Ricardo Dias <rdias@suse.com>
(cherry picked from commit c3465e03ad11d8c39b61a221aaee78762bc9465c)

6 years agoosd/PG: discover missing objects when an OSD peers and PG is degraded 27745/head
Jonas Jelten [Mon, 1 Apr 2019 10:28:09 +0000 (12:28 +0200)]
osd/PG: discover missing objects when an OSD peers and PG is degraded

When a PG is remapped from OSD `a` to OSD `b`, the objects are
backfilled. When OSD `a` is restarted, objects become degraded
as `a` is no longer queried or considered as a backfill source.

As the PG is degraded, `PG::discover_all_missing` is not called
when a candidate OSD peers with the primary: The PG is already
active, thus `PG::activate` (and in turn missing object discovery)
is not called. Discovery is also not initiated from
`PG::RecoveryState::Active::react(const MNotifyRec& notevt)`
as there are no unfound objects.

This patch adds a call to `discover_all_missing` when
when an OSD sends its `MNotifyRec` message and the PG is degraded.

Fixes: https://tracker.ceph.com/issues/37439
Signed-off-by: Jonas Jelten <jj@stusta.net>
(cherry picked from commit e152d092f7b7839bb27ac7a5cf1c95f4d3752b32)

6 years agomgr/dashboard: Manager should complain about wrong dashboard certificate
Volker Theile [Mon, 18 Mar 2019 16:00:09 +0000 (17:00 +0100)]
mgr/dashboard: Manager should complain about wrong dashboard certificate

Fixes: https://tracker.ceph.com/issues/24453
Signed-off-by: Volker Theile <vtheile@suse.com>
(cherry picked from commit a9ba5ba152cd54c3b4c94f5627cc85239906fe67)

6 years agoos/bluestore: fix out-of-bound access in bmap allocator. 27738/head
Igor Fedotov [Fri, 19 Apr 2019 12:43:07 +0000 (15:43 +0300)]
os/bluestore: fix out-of-bound access in bmap allocator.

Fixes: https://tracker.ceph.com/issues/39334
Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit b0d2411c9c48b49fff827841c5ec6b66533d9c58)

 Conflicts:
src/os/bluestore/fastbmap_allocator_impl.h

6 years agoos/bluestore_tool: bluefs-bdev-expand: indicate bypassed for main dev 27447/head
Igor Fedotov [Mon, 8 Apr 2019 18:54:25 +0000 (21:54 +0300)]
os/bluestore_tool: bluefs-bdev-expand: indicate bypassed for main dev

Pre-nautilis releases are unable to expand main device but they do not
 report about that hence user thinks expansion succeeds. Which is confusing.

Fixes: https://tracker.ceph.com/issues/39144
Signed-off-by: Igor Fedotov <ifedotov@suse.com>
6 years agoMerge pull request #26829 from pdvian/wip-38546-mimic
Nathan Cutler [Tue, 23 Apr 2019 15:02:00 +0000 (17:02 +0200)]
Merge pull request #26829 from pdvian/wip-38546-mimic

mimic: doc: updated reference link for log based PG

Reviewed-by: Neha Ojha <nojha@redhat.com>
6 years agoMerge pull request #27606 from ifed01/wip-ifed-fix-alloc-ut
Nathan Cutler [Fri, 19 Apr 2019 11:02:38 +0000 (13:02 +0200)]
Merge pull request #27606 from ifed01/wip-ifed-fix-alloc-ut

mimic: os/bluestore: fix improper backport for p2 macros for bmap allocator

Reviewed-by: Xie Xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
6 years agoos/bluestore: fix improper backport for p2 macros for bmap alocator 27606/head
Igor Fedotov [Tue, 16 Apr 2019 11:28:43 +0000 (14:28 +0300)]
os/bluestore: fix improper backport for p2 macros for bmap alocator

Fixes: 3244c871f36ee22ee826a96f30e82a8d05c9170c
This caused TestAllocatorLevel01.test_4G_alloc_bugN to fail in mimic.

Signed-off-by: Igor Fedotov <ifedotov@suse.com>
6 years agorgw: s3: awsv4 drop special handling for x-amz-credential 27666/head
Abhishek Lekshmanan [Mon, 20 Aug 2018 15:45:04 +0000 (17:45 +0200)]
rgw: s3: awsv4 drop special handling for x-amz-credential

While s3 docs mention that every byte must be urlencoded, they are relaxed in
its implementation, when testing this behaviour on aws s3 itself, they seem to
be relaxed in handling aws credentials of the form

X-Amz-Credential=access1/20180817T123456Z/us-east-1...

wherein

X-Amz-Credential=access1%2F2018...

is expected. This allows for clients requesting the urls in both forms to
succeed as aws s3 does at the moment

Fixes: http://tracker.ceph.com/issues/26965
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit 25e1d2a32074254e9ebd780f3a41b2ff6469370f)

6 years agorgw: should recode canonical_uri when caculate s3v4 auth
yuliyang [Sat, 7 Apr 2018 10:58:55 +0000 (06:58 -0400)]
rgw: should recode canonical_uri when caculate s3v4 auth

fix: http://tracker.ceph.com/issues/23587

Signed-off-by: yuliyang <yuliyang@cmss.chinamobile.com>
(cherry picked from commit 919a8976cf40866e7212c5bb2ff38a9c5f8a1f75)

6 years agoMerge pull request #27228 from tchaikov/mimic-36737
Yuri Weinstein [Wed, 17 Apr 2019 23:33:34 +0000 (16:33 -0700)]
Merge pull request #27228 from tchaikov/mimic-36737

mimic: ceph-disk/tests: use random unused port for CEPH_MON

Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
Reviewed-by: Alfredo Deza <adeza@redhat.com>
6 years agoMerge pull request #27259 from pdvian/wip-38872-mimic
Yuri Weinstein [Wed, 17 Apr 2019 23:32:35 +0000 (16:32 -0700)]
Merge pull request #27259 from pdvian/wip-38872-mimic

mimic: pybind/rados: fixed Python3 string conversion issue on get_fsid

Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agorgw: beast: set a default port for endpoints 27661/head
Abhishek Lekshmanan [Thu, 28 Mar 2019 12:41:23 +0000 (13:41 +0100)]
rgw: beast: set a default port for endpoints

if no port is specified we don't set one(or set to 0), and don't exactly error
out, so rgw keeps running without being bound to a port. Set the port to default
in these cases

Fixes: http://tracker.ceph.com/issues/39000
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit 9e5d4bd1a5d74490268e4dc16e885a64a1c2644c)

6 years agomon/OSDMonitor: further improve prepare_command_pool_set E2BIG error message 27647/head
Nathan Cutler [Wed, 17 Apr 2019 12:46:06 +0000 (14:46 +0200)]
mon/OSDMonitor: further improve prepare_command_pool_set E2BIG error message

d2c0fe9b5319a4404965c40ec92e291802ef30f6 improved this error message,
but it can be improved further by suggesting that the pg_num be increased in
smaller increments.

This commit is not cherry-picked from master because 4d3407ba93b2c15dd86aa7f97bd9f29c3508c60e
(merged for Nautilus) removed the error message in question.

Fixes: http://tracker.ceph.com/issues/39353
Signed-off-by: Nathan Cutler <ncutler@suse.com>
6 years agomgr: enable inter-module calls 27638/head
John Spray [Thu, 14 Dec 2017 11:24:18 +0000 (06:24 -0500)]
mgr: enable inter-module calls

This is being done by passing native CPython objects
back and forth.  It's safe because sub-interpreters in CPython
share memory allocation infrastructure and share the GIL.

With a view to PEP554, we limit inter-interpreter calls
to pickleable objects, so that this may be implemented
using byte-arrays in future.

This infrastructure should enable:
 - the dashboard to display the status of other modules, for
   example the set of progress indicators from `progress`
 - dashboard and restful to share an underlying long running
   job mechanism.

Signed-off-by: John Spray <john.spray@redhat.com>
(cherry picked from commit f02316adb4baf4dceaab79cc0ef4c2acdb544f3e)

6 years agoceph-objectstore-tool: Rename dump-import to dump-export 27635/head
David Zafman [Fri, 12 Apr 2019 20:09:43 +0000 (13:09 -0700)]
ceph-objectstore-tool: Rename dump-import to dump-export

If user specifies dump-import it will still work, but isn't
in the usage that way.

Fixes: http://tracker.ceph.com/issues/39284
Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 96861a8116242bdef487087348c24c97723dfafc)

Conflicts:
qa/standalone/special/ceph_objectstore_tool.py
src/tools/ceph_objectstore_tool.cc
- trivial resolution

6 years agoosd/PGLog: preserve original_crt in merge_log() 27629/head
Neha Ojha [Mon, 25 Mar 2019 21:48:04 +0000 (14:48 -0700)]
osd/PGLog: preserve original_crt in merge_log()

Fixes: https://tracker.ceph.com/issues/21174
Signed-off-by: Neha Ojha <nojha@redhat.com>
(cherry picked from commit 47215a5c0e1544c9080fda1eee8f04c9890eea42)

6 years agoosd/PGLog: preserve original_crt in proc_replica_log()
Neha Ojha [Tue, 12 Feb 2019 01:21:53 +0000 (17:21 -0800)]
osd/PGLog: preserve original_crt in proc_replica_log()

This is to prevent rolling back further than deleted object version.

Signed-off-by: Neha Ojha <nojha@redhat.com>
(cherry picked from commit cd25c1d79d189b4e0389927e7c20d75afd2661d9)

6 years agoosd/PGLog: should not rollback further than deleted object version
Neha Ojha [Wed, 6 Feb 2019 03:23:21 +0000 (19:23 -0800)]
osd/PGLog: should not rollback further than deleted object version

When a deleted object becomes a divergent entry in the pg log,
we should not be able to rollback to a version of the deleted
object that doesn't exist.

To avoid this, we need to preserve the original crt of the pg log,
before we update it in rewind_from_head() and use that to decide whether
we can rollback or not in _merge_object_divergent_entries().

Fixes: http://tracker.ceph.com/issues/36739
Signed-off-by: Neha Ojha <nojha@redhat.com>
(cherry picked from commit de18c592259816ad013ac82983cdec71bbfa51a0)

Conflicts:
src/osd/PGLog.h : Resolved in struct PGLog

6 years agomgr/dashboard: Use human readable units on the sparkline graphs 27558/head
Tiago Melo [Mon, 6 Aug 2018 10:32:02 +0000 (11:32 +0100)]
mgr/dashboard: Use human readable units on the sparkline graphs

Fixes: http://tracker.ceph.com/issues/25075
Signed-off-by: Tiago Melo <tmelo@suse.com>
(cherry picked from commit 6a8cdcef779a84a4610bbf78a87ec9e58f18465c)

6 years agorgw admin: add tenant argument to reshard cancel 27603/head
Abhishek Lekshmanan [Mon, 11 Mar 2019 14:09:03 +0000 (15:09 +0100)]
rgw admin: add tenant argument to reshard cancel

Looks like we ignore the tenant argument for reshard cancel as mentioned in the
issue.

Fixes: https://tracker.ceph.com/issues/38214
Reported-by: Ed Fisher <ed@debacle.org>
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit ff64af392429ebb4e601f048307ff744cefaaa43)

6 years agorbd: krbd: return -ETIMEDOUT in polling 27588/head
Dongsheng Yang [Mon, 18 Mar 2019 03:04:52 +0000 (23:04 -0400)]
rbd: krbd: return -ETIMEDOUT in polling

We don't want to wait on uevent forever, but the return value
of polling in timeout is 0 rather than a negative value.

Fixes: http://tracker.ceph.com/issues/38792
Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
(cherry picked from commit ab833b823bf7dc5750f281a81f31ed8f708df73d)

6 years agoosd: process_copy_chunk remove obc ref before pg unlock 27587/head
Zengran Zhang [Mon, 25 Mar 2019 08:54:54 +0000 (16:54 +0800)]
osd: process_copy_chunk remove obc ref before pg unlock

drop the obc ref when pg locked is more safer, if not, on_change
may failed to clear it, and on_flushed may find leak.

Fixes: http://tracker.ceph.com/issues/38842
Signed-off-by: Kefu Chai kchai@redhat.com
Signed-off-by: Zengran Zhang <zhangzengran@sangfor.com.cn>
(cherry picked from commit 70874399da47411e1e07824ef50dd82c4ebb6922)

6 years agoos/bluestore: call fault_range properly prior to looking for blob to reuse 27570/head
Igor Fedotov [Mon, 8 Apr 2019 16:41:55 +0000 (19:41 +0300)]
os/bluestore: call fault_range properly prior to looking for blob to reuse

Fixes: https://tracker.ceph.com/issues/21312
Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit e0a395ee2240d7565953a9bb0a1e5c336efe6336)

6 years agoMerge pull request #27284 from pdvian/wip-38904-mimic
Yuri Weinstein [Fri, 12 Apr 2019 20:23:44 +0000 (13:23 -0700)]
Merge pull request #27284 from pdvian/wip-38904-mimic

mimic: osd/PGLog.h: print olog_can_rollback_to before deciding to rollback

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
6 years agoMerge pull request #27298 from ifed01/wip-ifed-alloc-issues-mimic
Yuri Weinstein [Fri, 12 Apr 2019 20:23:14 +0000 (13:23 -0700)]
Merge pull request #27298 from ifed01/wip-ifed-alloc-issues-mimic

mimic: os/bluestore: bitmap allocator might fail to return contiguous chunk despite having enough space

Reviewed-by: Sage Weil <sage@redhat.com>
6 years agoMerge pull request #27318 from ifed01/wip-ifed-fix-p2-mimic
Yuri Weinstein [Fri, 12 Apr 2019 20:22:41 +0000 (13:22 -0700)]
Merge pull request #27318 from ifed01/wip-ifed-fix-p2-mimic

mimic: include/intarith: enforce the same type for p2*() arguments

Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
6 years agoMerge pull request #27188 from smithfarm/wip-38901-mimic
Nathan Cutler [Fri, 12 Apr 2019 15:13:57 +0000 (17:13 +0200)]
Merge pull request #27188 from smithfarm/wip-38901-mimic

mimic: doc: Minor rados related documentation fixes

Reviewed-by: David Zafman <dzafman@redhat.com>
6 years agoMerge pull request #27476 from tchaikov/mimic-39164
Yuri Weinstein [Fri, 12 Apr 2019 15:00:16 +0000 (08:00 -0700)]
Merge pull request #27476 from tchaikov/mimic-39164

mimic: qa: install python36-{cephfs,rados} instead of python34-*

Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
Reviewed-by: Boris Ranto <branto@redhat.com>
6 years agoinstall-deps.sh: install '*rpm-macros' 27476/head
Kefu Chai [Thu, 11 Apr 2019 16:11:42 +0000 (00:11 +0800)]
install-deps.sh: install '*rpm-macros'

so `yum-builddep` can have access to the latest macros for preparing the
build dependencies

Fixes: http://tracker.ceph.com/issues/39164
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 087ea813a061a1d6858aeae57950e90965f4ae15)