Commit Graph

69745 Commits

Author SHA1 Message Date
liuchang0812
8838fafc44 os/bluestore: convert rocksdb_db_paths to SAFE_OPTION
We need to change `rocksdb_db_paths` in runtime. pass safe=false to set_val is not
a good behavior. We should use SAFE_OPTION.

Signed-off-by: liuchang0812 <liuchang0812@gmail.com>
2017-03-22 20:39:50 +08:00
liuchang0812
b5582dda23 common: convert plugin_dir and erasure_plugin_dir to SAFE_OPTION
Signed-off-by: liuchang0812 <liuchang0812@gmail.com>
2017-03-21 23:03:13 +08:00
liuchang0812
cddc01d9b4 common/config: eliminate config_t::set_val unsafe option
Fixes: http://tracker.ceph.com/issues/19106

Signed-off-by: liuchang0812 <liuchang0812@gmail.com>
2017-03-21 19:35:25 +08:00
Haomai Wang
fe66443240 Merge pull request #13971 from optimistyzy/0315_1
os/blestore/NVMEDevice: fix the I/O logic for read

Reviewed-by: Haomai Wang <haomai@xsky.com>
2017-03-21 05:18:20 +08:00
Yuri Weinstein
1732698962 Merge pull request #13923 from xiexingguo/wip-clean-pglog-t
OSD: drop parameter t from merge_log()

Reviewed-by: Gregory Farnum <gfarnum@redhat.com>
2017-03-20 13:05:54 -07:00
Yuri Weinstein
80a10ec16c Merge pull request #13938 from jimmyway/wip-chg-return-value-to-refs
osd: replace object_info_t::operator=() with decode()

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-03-20 13:04:44 -07:00
Yuri Weinstein
9b3c2daeb8 Merge pull request #13980 from majianpeng/filejournal-bufferlist-rebuild
os/filestore/FileJournal: bufferlist rebuild

Reviewed-by: Sage Weil <sage@redhat.com>
2017-03-20 13:03:58 -07:00
Sage Weil
decb9d00d7 Merge pull request #13535 from dongbula/add-rgw-finisher-to-perfcounter
rgw: add radosclient finisher to perf counter

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2017-03-20 10:20:48 -05:00
Casey Bodley
6f5d509476 Merge pull request #13955 from wangzhengyong/notify_finish
rgw: handle error return value in build_linked_oids_index

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2017-03-20 10:25:39 -04:00
Casey Bodley
0afb438cce Merge pull request #13820 from mikulely/cleanup-rgw-lc
rgw: cleanup lifecycle managament

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2017-03-20 10:25:14 -04:00
Casey Bodley
75be7eac7a Merge pull request #13481 from theanalyst/rgw/env-dout
rgw: don't log the env_map twice

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2017-03-20 10:20:43 -04:00
Matt Benjamin
8af0e58642 Merge pull request #13895 from guihecheng/rgw_file-fix
rgw_file: fix reversed return value of getattr
2017-03-20 09:54:02 -04:00
Matt Benjamin
ef805fe862 Merge pull request #14045 from guihecheng/rgw_file-fix-retcode
rgw_file: fix non-negative return code for open operation
2017-03-20 09:44:18 -04:00
Jason Dillaman
4ad10888d2 Merge pull request #14049 from yangdongsheng/rbd_cleanup
cleanup: rbd: fix a typo in comment

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2017-03-20 09:37:41 -04:00
Ziye Yang
f2a1e34f88 Bluestore,NVMEDEVICE: fix the I/O logic for READ
Aio_submit will submit both aio_read/write, and also there
are synchronized read and random read, so we need to
handle the read I/O completion in a correct way.

Since random read has its own ioc, so the
num_reading for ioc will be at most 1, which will be easy
to handle in io_complete. And we need only to differentiate
whethere it is an aio_read.

Also fix the exception logic in command send, make the style
consistent.

Signed-off-by: optimistyzy <optimistyzy@gmail.com>
2017-03-20 17:46:52 +08:00
Kefu Chai
ad4ffed838 Merge pull request #13936 from ZVampirEM77/cleanup-rgw-doc
doc: fix typos in radosgw-admin usage

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-03-20 15:49:08 +08:00
Kefu Chai
fa54a27132 Merge pull request #13559 from voidbag/wip-fix-_open_super_meta
os/bluestore: fix bug in _open_super_meta()

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-03-20 15:32:28 +08:00
Kefu Chai
a824249f87 Merge pull request #13718 from aclamk/wip-bs-indexed-bitshift
os/bluestore: cleanup, got rid of table reference of 1<<x

Reviewed-by: Sage Weil <sage@redhat.com>
2017-03-20 15:31:10 +08:00
Kefu Chai
684ae029e6 Merge pull request #13769 from wangzhengyong/wip-noid
os/bluestore: "noid" is not always necessary in clone op

Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2017-03-20 15:30:29 +08:00
Kefu Chai
cbd3f6c431 Merge pull request #13804 from xiaoxichen/fix_adminsocket
pybind/ceph_daemon: use small chunk for recv

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-03-20 15:28:58 +08:00
Kefu Chai
a838f20d47 Merge pull request #13814 from liupan1111/wip-fix-remove-when-full
rados: allow "rados purge" to delete objects when osd is full

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2017-03-20 15:28:01 +08:00
Kefu Chai
6554403bea Merge pull request #13822 from Liuchang0812/wip-event-center-bug
msg/async: fix crash that writing char to nonblock-fd gets EAGAIN in EventCenter::wakeup

Reviewed-by: Haomai Wang <haomai@xsky.com>
2017-03-20 15:26:54 +08:00
Kefu Chai
cb6ab91f41 Merge pull request #13853 from tchaikov/wip-19134
mon/MonClient: don't return zero global_id

Reviewed-by: Yan, Zheng <zyan@redhat.com>
2017-03-20 15:25:34 +08:00
Yan, Zheng
6b1473c564 Merge pull request #13899 from jcsp/wip-19245
mds: fix handling very fast delete ops
2017-03-20 14:49:48 +08:00
Kefu Chai
35ae186059 Merge pull request #14007 from badone/wip-api-doc-code-fixes
docs: Fix problems with example code

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-03-20 12:12:28 +08:00
Kefu Chai
a46e6c93da Merge pull request #14028 from tchaikov/wip-kill-gcc-warning
os/bluestore: silence gcc warning

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
2017-03-20 12:05:36 +08:00
Kefu Chai
3e48017298 Merge pull request #13969 from tchaikov/wip-ceph-disk-manpage-formatting
man/8/ceph-disk: fix formatting

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2017-03-20 12:04:05 +08:00
Gui Hecheng
b5f70ef7b0 rgw_file: fix non-negative return code for open operation
The nfs-ganesha expects a negative retcode for errors.

Signed-off-by: Gui Hecheng <guihecheng@cmss.chinamobile.com>
2017-03-20 10:53:46 +08:00
Matt Benjamin
2beb4ee2dd Merge pull request #13988 from guihecheng/rgw_file-fix-rename
rgw_file: fix double unref on rgw_fh for rename
2017-03-19 20:01:45 -04:00
Brad Hubbard
8262fd5d17 Merge pull request #14033 from wjin/clean
mon/PGMonitor: rm nonused function

Reviewed-by: Jos Collin <jcollin@redhat.com>
Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
2017-03-19 10:03:42 +10:00
Wei Jin
b2b4f38198 mon/PGMonitor: rm nonused function
Signed-off-by: Wei Jin <wjin.cn@gmail.com>
2017-03-18 21:51:49 +08:00
Kefu Chai
2eb61b6de7 os/bluestore: silence gcc warning
src/os/bluestore/BitAllocator.h:410:8: warning: ‘virtual bool
BitMapAreaIN::child_check_n_lock(BitMapArea*, int64_t, bool)’ was
hidden    [-Woverloaded-virtual]
 bool child_check_n_lock(BitMapArea *child, int64_t required, bool
lock) {
      ^~~~~~~~~~~~~~~~~~
 /var/ceph/ceph/src/os/bluestore/BitAllocator.h:489:8: warning:   by
 ‘BitMapAreaLeaf::child_check_n_lock’ [-Woverloaded-virtual]
  bool child_check_n_lock(BitMapZone* child, int64_t required, bool
  lock);
       ^~~~~~~~~~~~~~~~~~

Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-03-18 16:41:50 +08:00
Loic Dachary
8fbc61a725 Merge pull request #13917 from nikitych/add-oracle-distros
ceph-detect-init: Adds Oracle Linux Server and Oracle VM Server detect

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2017-03-18 08:48:58 +01:00
Xie Xingguo
5daa9b2e80 Merge pull request #14006 from ShiqiCooperation/master
test/unittest_bluefs: remove unused variable

Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-03-18 15:27:36 +08:00
Mykola Golub
949915c6fa Merge pull request #14005 from liupan1111/wip-fix-resize-issue
rbd-nbd: update size only when NBD_SET_SIZE successful

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
2017-03-18 09:09:53 +02:00
Yuri Weinstein
9e71f29e7f Merge pull request #13922 from gregsfortytwo/wip-pg-unsigned-warning
osd: fix a signed/unsigned warning in PG

Reviewed-by: Sage Weil <sage@redhat.com>
2017-03-17 14:39:04 -07:00
Yuri Weinstein
c187200723 Merge pull request #13946 from LiumxNL/wip-170313
osd: don't share osdmap with objecter when preboot

Reviewed-by: Sage Weil <sage@redhat.com>
2017-03-17 14:35:45 -07:00
Sage Weil
6c6b1beb38 Merge pull request #13911 from liewegas/wip-bluestore-fix-flush
os/bluestore: fix bugs in bluefs and bdev flush

Reviewed-by: Haomai Wang <haomai@xsky.com>
2017-03-17 13:36:42 -05:00
Mykola Golub
3cea3ace11 Merge pull request #12364 from dillaman/wip-rbd-mirror-notifications
rbd-mirror: replace remote pool polling with add/remove notifications

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
2017-03-17 19:01:00 +02:00
Jason Dillaman
76d46b5406 Merge pull request #12970 from VictorDenisov/snapshot_namespace_index
librbd: add SnapshotNamespace to ImageCtx

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2017-03-17 12:57:56 -04:00
John Spray
e5ceec98e7 Merge pull request #14019 from singler/wip-cleanup-create_new_fs
mon/MDSMonitor: remove create_new_fs from header

Reviewed-by: John Spray <john.spray@redhat.com>
2017-03-17 16:04:07 +00:00
Casey Bodley
5e29a9f64d Merge pull request #13684 from shashalu/rgw-admin-init-bucket-for-sync
rgw: fix init_bucket_for_sync retcode

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2017-03-17 09:40:17 -04:00
Henrik Korkuc
9ff0c7db3c mon/MDSMonitor: remove create_new_fs from header
create_new_fs was refactored and moved earlier. This removes a left
over header entry.

Signed-off-by: Henrik Korkuc <henrik@kirneh.eu>
2017-03-17 15:31:48 +02:00
Haomai Wang
d96bf146cd Merge pull request #14012 from optimistyzy/0317_2
bluestore,NVMEDevice: minor error for get slave core

Reviewed-by: Haomai Wang <haomai@xsky.com>
2017-03-17 18:18:05 +08:00
Ziye Yang
662ff45e17 bluestore,NVMEDevice: minor error for get slave core
The second parameter should set to 1 to skip master core.

Signed-off-by: Ziye Yang <optimistyzy@gmail.com>
2017-03-17 17:23:51 +08:00
Loic Dachary
0214e06305 Merge pull request #13646 from mslovy/wip-fix-test-pidfile
test: fix test_pidfile

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2017-03-17 09:26:10 +01:00
Jiaying Ren
b843cad81d doc: fix typos in common/config_opts.h comments
Signed-off-by: Jiaying Ren <jiaying.ren@umcloud.com>
2017-03-17 14:59:44 +08:00
Jiaying Ren
4ce8ead484 rgw: kill dead lc config options
+ rgw_lifecycle_enabled is redundant with rgw_enable_lc_threads,which is
  wildly used.
+ rgw_lifecycle_thread is never used.

Signed-off-by: Jiaying Ren <jiaying.ren@umcloud.com>
2017-03-17 14:59:44 +08:00
Jiaying Ren
c45d59f78c rgw: cleanup redundant file include for lc
Signed-off-by: Jiaying Ren <jiaying.ren@umcloud.com>
2017-03-17 14:59:12 +08:00
Brad Hubbard
ccdb61b349 docs: Fix problems with example code
Current code generates warnings and, in some cases, doesn't compile.

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
2017-03-17 16:12:41 +10:00