Commit Graph

46819 Commits

Author SHA1 Message Date
Yuan Zhou
0b951fde26 Doc: fix misleading configuration guide on cache tiering
* The flush/evict won't work if target_max_bytes/objects are not configured.

* All client requests will be blocked only when target_max_bytes/objects
  are reached. Hitting on cache_target_full_ratio will not block client
  requests.

Signed-off-by: Yuan Zhou <yuan.zhou@intel.com>
2015-12-21 16:27:37 +08:00
Sage Weil
7dca87c63c Merge pull request #6766 from xiexingguo/xxg-wip-cleanup
osd: fix wrongly placed assert and some cleanups

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-12-19 14:02:02 -05:00
Sage Weil
a96ee93363 Merge pull request #6708 from xiaoxichen/shutdown_when_flipping
osd: shut down if we flap too many times in a short period

Reviewed-by: Sage Weil <sage@redhat.com>
2015-12-19 14:01:31 -05:00
Sage Weil
64cb5f6a20 Merge pull request #5782 from ceph/wip-cxx11time
common: new timekeeping common code, and Objecter conversion

Reviewed-by: Sage Weil <sage@redhat.com>
2015-12-19 14:00:37 -05:00
Sage Weil
ae0dc478b2 Merge pull request #6796 from dx9/wip-12406-sys_siglist
common: signal_handler: added support for using reentrant strsignal() implementations vs. sys_siglist[]

Reviewed-by: Sage Weil <sage@redhat.com>
2015-12-19 13:59:55 -05:00
Sage Weil
5f9f986fd4 Merge pull request #6814 from stiopaa1/rem_inc
msg: removed unneeded includes from Dispatcher

Reviewed-by: Sage Weil <sage@redhat.com>
2015-12-19 13:59:27 -05:00
Sage Weil
2fe8180353 Merge pull request #6881 from wido/mon-codestyle-fix
mon: fix coding-style on PG related Monitor files

Reviewed-by: Sage Weil <sage@redhat.com>
2015-12-19 13:58:12 -05:00
Sage Weil
6bb34fefd6 Merge pull request #6921 from liewegas/wip-kv-log
osd,mon: log leveldb and rocksdb to ceph log

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-12-19 13:57:34 -05:00
Sage Weil
0114cb53b7 Merge pull request #6950 from mslovy/wip-optimaze-map
osd: misc optimization for map utilization

Reviewed-by: Sage Weil <sage@redhat.com>
2015-12-19 13:57:02 -05:00
Sage Weil
ce995d7de9 Merge pull request #6963 from liewegas/wip-memstore
osd: memstore: fix two bugs

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2015-12-19 13:56:32 -05:00
Josh Durgin
a2befde278 Merge pull request #6982 from dillaman/wip-librbd-valgrind
librbd: uninitialized state in snap remove state machine

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-12-18 15:19:58 -08:00
Jason Dillaman
6d9da6a641 librbd: uninitialized state in snap remove state machine
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-12-18 16:41:21 -05:00
Jason Dillaman
28081d777d Merge pull request #6978 from trociny/fix-rbd-init-order
rbd: fix static initialization ordering issues

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2015-12-18 15:42:24 -05:00
Adam C. Emerson
ecf2bebe99 time: Update OSDC for C++11 Time
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
2015-12-18 15:16:17 -05:00
Adam C. Emerson
ac964259b4 osdc: Whitespace
Since I'm making a pervasive change anyway, knock off end-of-line spaces
and wrap overly long lines.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
2015-12-18 15:16:17 -05:00
Adam C. Emerson
4367eb18d2 perfcounters: Allow C++11 time increment/decrement
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
2015-12-18 15:15:04 -05:00
Adam C. Emerson
a3a7c037bf timer: Another timer using new time/lock standards
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
2015-12-18 15:15:03 -05:00
Adam C. Emerson
08f26766b3 time: Overload for std:chrono in Cond::TimedWait
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
2015-12-18 15:15:03 -05:00
Adam C. Emerson
84dcfbd8ba time: Add basic support for std::chrono based time
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
2015-12-18 15:15:03 -05:00
Sage Weil
04e290887c Merge pull request #6701 from XinzeChi/wip-batch-peek-journal
osd: FileJournal: support batch peak and pop from writeq

Reviewed-by: Sage Weil <sage@redhat.com>
2015-12-18 15:09:21 -05:00
Sage Weil
14f5d3ba69 Merge pull request #6804 from ceph/putting-the-fail-in-assertion-failed
common: assert: abort() rather than throw

Reviewed-by: Sage Weil <sage@redhat.com>
2015-12-18 15:08:22 -05:00
Sage Weil
3aa9eb3518 Merge pull request #6900 from liewegas/wip-13988
mon: fix reuse of osd ids (clear osd info on osd deletion)

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-12-18 15:07:49 -05:00
Sage Weil
2dbb19d99f Merge pull request #6902 from XinzeChi/wip-pg_stat_t-encoding
osd: utime_t, eversion_t, osd_stat_sum_t encoding optimization

Reviewed-by: Sage Weil <sage@redhat.com>
2015-12-18 15:07:14 -05:00
Sage Weil
471164d61a Merge pull request #6909 from mslovy/wip-shared-cache
common: improve shared_cache and simple_cache efficiency with hash table

Reviewed-by: Sage Weil <sage@redhat.com>
2015-12-18 15:06:14 -05:00
Mykola Golub
b21152a27f rbd: fix "static initialization order fiasco"
The order in which static objects in different compilation units are
initialized is undefined. Use static functions as a workaround.

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2015-12-18 21:40:49 +02:00
Josh Durgin
2340fbdbaa Merge pull request #6968 from xiexingguo/xxg-wip-14118
librbd: exit if parent's snap is gone during clone

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-12-18 09:00:45 -08:00
xiexingguo
395bf8a8be librbd: exit if parent snap is gone during clone
Fixes: #14118
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2015-12-18 23:01:38 +08:00
Jason Dillaman
6eacdc534f Merge pull request #6914 from x11562/x11562
rbd: additional validation for striping parameters

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2015-12-18 09:14:11 -05:00
Jason Dillaman
deaf2c1bf1 Merge pull request #6958 from xiexingguo/patch-1
librbd: return error if we fail to delete object_map head object

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2015-12-18 09:06:03 -05:00
Jason Dillaman
9caf3caaa0 Merge pull request #6965 from kylinstorage/wip-rbd-default-order
rbd: use default order from configuration when not specified

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2015-12-18 09:03:10 -05:00
Loic Dachary
0bf7c0e0b0 Merge pull request #6928 from HeyoQiang/heyongqiang1215
Monitor: modify a dout level in OSDMonitor.cc

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-12-18 09:25:30 +01:00
Yongqiang He
d4cf79b803 mon: modify the level of a log about OSD's condition in OSDMonitor.cc
In actual use, we replace old hard disk by new or do performance testing regularly and need to down OSDs manually, but there are some OSDs can not be marked down, and there is no obvious information.
The log { dout(5) << "can_mark_down current up_ratio " << up_ratio << " < min "<< g_conf->mon_osd_min_up_ratio<< ", will not mark osd." << i << "down" << dendl ; }" can explain  why it happened.
   In addition, we can change the value of mon_osd_min_up_ratio more reasonable in our operating environment.so it is necessary to adjust the log's level lower.

For example:
   There are 6 OSDs , wen have marked down 5 of them and the mon_osd_min_up_ratio = 0.3.
   In this situation, when we mark the last OSD to down, it will show "ceph-osd stop/waiting", but in actually, the OSD is still up.

Signed-off-by: Yongqiang He <he.yongqiang@h3c.com>
2015-12-18 04:15:04 -05:00
Yunchuan Wen
127cd92919 rbd: use default order value from g_conf
Signed-off-by: Yunchuan Wen <yunchuan.wen@kylin-cloud.com>
2015-12-18 15:16:20 +08:00
Sage Weil
af44fe64c9 Merge pull request #6847 from oritwas/wip-fix-warning
build: fix a few warnings

Reviewed-by: Sage Weil <sage@redhat.com>
2015-12-17 16:41:06 -05:00
Sage Weil
8a3e55f6b4 Merge pull request #6924 from stiopaa1/removefriend
msg/simple: remove unneeded friend declarations

Reviewed-by: Sage Weil <sage@redhat.com>
2015-12-17 16:39:51 -05:00
Sage Weil
a32dd5e3b2 Merge pull request #6405 from jcsp/wip-9963
librados: new style (sharded) object listing

Reviewed-by: Sage Weil <sage@redhat.com>
2015-12-17 15:38:17 -05:00
Sage Weil
fc39e6fe26 os/MemStore: fix use-after-free on iterator
Signed-off-by: Sage Weil <sage@redhat.com>
2015-12-17 11:30:09 -05:00
Casey Bodley
750e412782 memstore: fix loop in PageSetObject::clone()
Signed-off-by: Casey Bodley <cbodley@redhat.com>
2015-12-17 11:30:06 -05:00
Kefu Chai
9d874f1d34 Merge pull request #6945 from jcsp/wip-blacklist-clear
mon: add `osd blacklist clear`

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
2015-12-17 22:17:26 +08:00
Loic Dachary
3a951650d4 Merge pull request #6959 from oritwas/wip-fix-run-cmake-check
cmake: no need to run configure from run-cmake-check.sh

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-12-17 15:04:38 +01:00
Sage Weil
70240f7ff7 Merge pull request #6564 from branch-predictor/bp-fix-mon-kv-store
mon: fixes related to mondbstore->get() changes

Reviewed-by: Sage Weil <sage@redhat.com>
2015-12-17 08:59:33 -05:00
Sage Weil
4060d21ede Merge pull request #6202 from cxwshawn/wip-ful-fix
rados: implement rm --force option to force remove when full

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-12-17 08:58:53 -05:00
Orit Wasserman
3d6e51c40f rbd: fix "was hidden" warning
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
2015-12-17 14:38:49 +01:00
Orit Wasserman
95afcad92d newstore: fix was hidden warning
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
2015-12-17 14:38:49 +01:00
Orit Wasserman
3167608b93 rgw: use unsigned long to print to log
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
2015-12-17 14:38:49 +01:00
Sage Weil
03f9c6f2ff Merge pull request #6956 from somnathr/wip-conditional-drive-metadata-collection
osd: FileStore: conditional collection of drive metadata

Reviewed-by: Sage Weil <sage@redhat.com>
2015-12-17 08:35:52 -05:00
Joao Eduardo Luis
cf5da012ad Merge pull request #6929 from clever215/mon-log
mon: degrade a log message to level 2

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
2015-12-17 13:27:41 +00:00
Orit Wasserman
432d26cb98 cmake: no need to run configure from run-cmake-check.sh
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
2015-12-17 14:03:15 +01:00
Loic Dachary
54d6b47a09 Merge pull request #6864 from scienceluo/wip-cleanup
osdmap: remove unused local variables

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-12-17 07:52:19 +01:00
xiexingguo
7daa1ccf97 librbd: return error if we fail to delete object_map head object
Fixes: #14098
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2015-12-17 14:13:01 +08:00