Commit Graph

46874 Commits

Author SHA1 Message Date
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
Josh Durgin
d7581cda4a Merge pull request #6979 from dillaman/wip-14123-jewel
librbd: correct issues discovered when cache is disabled

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-12-18 13:25:35 -08:00
Josh Durgin
73358df6de Merge pull request #6974 from dillaman/wip-14108-jewel
librbd: correct issues discovered during teuthology testing

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-12-18 13:13:44 -08: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
Jason Dillaman
bfc9690dd1 librbd: skip journal event if write/discard was no-op
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-12-18 15:14:34 -05:00
Jason Dillaman
f6659cc7f0 librbd: object map ENOENT optimizations should complete asynchronously
This ensures a consistent lock ordering between the optimized path and
a librados callback. Remove the cache writebach handler's custom finisher
and re-use the op_work_queue.

Fixes: #14123
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-12-18 15:14:06 -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
Jason Dillaman
913339f75f librbd: update exclusive lock state when shutting down
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-12-18 14:15:10 -05:00
Jason Dillaman
200d310635 librbd: extra request required if journal enabled w/ caching
Fixes: #14108
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-12-18 13:14:58 -05:00
Jason Dillaman
bab16bbbeb librbd: stop the copyup thread during shutdown
Fixes: #14107, #14108
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-12-18 13:09:02 -05: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
Josh Durgin
ae18bcb719 Merge pull request #6972 from dillaman/wip-14106-jewel
rbd: merge_diff test should use new --object-size parameter instead of --order

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-12-18 08:46:55 -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
Jason Dillaman
69bcac513a qa/workunits/rbd: use --object-size instead of --order
Fixes: #14106
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-12-18 03:03:20 -05:00
na xie
94cd34b6a3 rbd: process crushed, rbd creating with striping parameters
Signed-off-by: Na Xie <xie.na@h3c.com>
2015-12-18 02:52:07 -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
Brad Hubbard
8e93f3f45d log: Log.cc: Assign LOG_DEBUG priority to syslog calls
Fixes: #13993
Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
2015-12-18 08:52:58 +10: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
Sage Weil
663466079d common/lockdep: increase max lock names
Recently hit this limit with

 /a/sage-2015-12-16_21:46:23-rados-wip-sage-testing---basic-openstack/40275

Signed-off-by: Sage Weil <sage@redhat.com>
2015-12-17 08:52:15 -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