Commit Graph

39761 Commits

Author SHA1 Message Date
Danny Al-Gaaf
a7b344388b submodules: --recursive needed for gtest in gmock
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2015-03-02 21:10:24 +01:00
Danny Al-Gaaf
dbcd55f93f gmock: add git submodule
Add gmock submodule and point to ceph-release-1.7.0 branch.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2015-03-02 21:08:46 +01:00
Danny Al-Gaaf
7b41871171 gmock: remove in-tree code copy
Step needed to replace by git submodules.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2015-03-02 21:05:46 +01:00
Loic Dachary
122ca1ea44 Merge pull request #3839 from dachary/wip-documentation
doc: ext4 has a journal

Reviewed-by: Simon Guinot <simon.guinot@sequanux.org>
2015-03-02 13:03:59 +01:00
Loic Dachary
7f36312ab6 doc: ext4 has a journal
Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-03-02 12:09:13 +01:00
Loic Dachary
3b424bfe22 Merge pull request #3834 from linuxbox2/xio-build
cmake:  build fixes

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-03-01 00:27:06 +01:00
Matt Benjamin
9ad02c9303 cmake: build fixes
* librbd
* test/ceph_dencoder

Signed-off-by: Matt Benjamin <matt@cohortfs.com>
2015-02-28 13:58:44 -05:00
Haomai Wang
721b3a0897 Merge pull request #3833 from yuyuyu101/temp
TestAsyncDriver: Fix typo in ceph_test_async_driver
2015-02-28 18:10:36 +08:00
Haomai Wang
4698fbe84e TestAsyncDriver: Fix typo in ceph_test_async_driver
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
2015-02-28 17:42:52 +08:00
Loic Dachary
c6d4d84c21 Merge pull request #3832 from tchaikov/fix-doc
doc/install/manual-deployment: fix osd install doc

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-02-28 10:35:18 +01:00
Kefu Chai
3cea092bf9 doc/install/manual-deployment: fix osd install doc
* should be using /var/lib/ceph/osd/{cluster-name}-{osd-num}/sysvinit
  instead of var/lib/ceph/osd/{cluster-name}-{hostname}/sysvinit, thanks
  to Kyle Hutson <kylehutson@ksu.edu>

Fixes: #10957
Signed-off-by: Kefu Chai <kchai@redhat.com>
2015-02-28 10:59:55 +08:00
Sage Weil
843ba7d42e doc/release-notes: fix Takeshi's name
Signed-off-by: Sage Weil <sage@redhat.com>
2015-02-27 14:19:06 -08:00
Sage Weil
bc638cf953 doc/release-notes: fix typo
Signed-off-by: Sage Weil <sage@redhat.com>
2015-02-27 13:21:00 -08:00
Sage Weil
6e308dc2cc doc/release-notes: v0.80.9 firefly
Signed-off-by: Sage Weil <sage@redhat.com>
2015-02-27 13:16:23 -08:00
Sage Weil
3e03b2fcb3 doc/release-notes: v0.93 release notes
Signed-off-by: Sage Weil <sage@redhat.com>
2015-02-27 11:09:45 -08:00
Loic Dachary
8559d92227 Merge pull request #3814 from tchaikov/fix-doc
doc/install/manual-deployment: s/mon/osd/ for osd install doc

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-02-27 13:54:54 +01:00
Loic Dachary
75059640a8 Merge pull request #3817 from tchaikov/misc-cosmetic-changes
Misc cosmetic changes

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-02-27 13:50:48 +01:00
Kefu Chai
43335039bf Merge pull request #3816 from fghaas/master
doc: trivial: fix missing newlines in rbd man page

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-02-27 18:50:43 +08:00
Kefu Chai
e6e493f37d add more constness
Signed-off-by: Kefu Chai <kchai@redhat.com>
2015-02-27 18:43:18 +08:00
Kefu Chai
01c99d0af3 OSD: mark internal methods as private
Signed-off-by: Kefu Chai <kchai@redhat.com>
2015-02-27 18:43:18 +08:00
Florian Haas
14315cf25f doc: trivial: fix missing newlines in rbd man page
As it were, the order, stripe_unit and stripe_count options were
followed by descriptions rendered in the same monospace font as the
options themselves. Insert newlines so they are rendered as regular
text, as was the original intention.

Signed-off-by: Florian Haas <florian@hastexo.com>
2015-02-27 11:21:03 +01:00
Kefu Chai
bc6502f491 fix unmatched struct versus class warnings
these warnings come from clang++

Signed-off-by: Kefu Chai <kchai@redhat.com>
2015-02-27 16:47:52 +08:00
Kefu Chai
4791895207 common/config: move config_obs_t's dtor back
so one can find the impl of config_obs_t at the expected place.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2015-02-27 16:46:11 +08:00
Kefu Chai
24c943d021 doc/install/manual-deployment: s/mon/osd/ for osd install doc
Fixes: #10957
Signed-off-by: Kefu Chai <kchai@redhat.com>
2015-02-27 16:15:18 +08:00
Sage Weil
4764798c5d Merge pull request #3797 from yuyuyu101/wip-reset-check
Messenger: Fix incorrect connect_seq increase when enabling reset_check

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2015-02-26 21:29:32 -08:00
Sage Weil
539c54b201 Merge pull request #3813 from tchaikov/add-doc-on-memory-level
doc: add docs about log's "memory level"
2015-02-26 21:06:00 -08:00
Kefu Chai
8806cd2528 doc: add docs about log's "memory level"
Signed-off-by: Kefu Chai <kchai@redhat.com>
2015-02-27 12:57:33 +08:00
Sage Weil
2d2f37d138 Merge pull request #3803 from guangyy/wip-7737
osd: fix negative degraded objects during backfilling

Backport: hammer, giant, firefly
2015-02-26 17:17:32 -08:00
Gregory Farnum
363be2df46 Merge pull request #3792 from ceph/wip-10912
client: re-send requests before composing the cap reconnect message

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2015-02-26 10:14:05 -08:00
Kefu Chai
1246e5d3df Merge pull request #3805 from gaurav36/master
osd: coverity fix: removing logically dead code

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-02-26 21:22:39 +08:00
Gaurav Kumar Garg
7d128a0fe5 coverity fix: removing logically dead code
coverity CID: 1260393

Signed-off-by: Gaurav Kumar Garg <garg.gaurav52@gmail.com>
2015-02-26 18:19:31 +05:30
John Spray
a7a70cabe2 Merge pull request #3751 from ceph/wip-mds-misc
mds: misc small patches

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2015-02-26 11:45:43 +00:00
Guang Yang
14d7e36d3c osd: fix negative degraded objects during backfilling
When there is deleting requests during backfilling, the reported number of degraded
objects could be negative, as the primary's num_objects is the latest (locally) but
the number for replicas might not reflect the deletings. A simple fix is to ignore
the negative subtracted value.

Signed-off-by: Guang Yang <yguang@yahoo-inc.com>
2015-02-26 08:13:12 +00:00
Haomai Wang
224a2d193e TestMsgr: Don't bind addr if not standby
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
2015-02-26 15:36:06 +08:00
Haomai Wang
0047699162 AsyncConnection: Drop connect_seq increase line
Learn commit 249acf62e764f9d08104c1a070e382a2fdab8824

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
2015-02-26 15:35:59 +08:00
Haomai Wang
67225cb3ee Pipe: Drop connect_seq increase line
Revert commit 0fc47e267b.

When accepting and "connect.connect_seq == existing->connect_seq",
existing->state maybe STATE_OPEN, STATE_STANDBY or STANDY_CONNECTING.
This commit only fix partial problem and want to assert
"(existing->state == STATE_CONNECTING)".

So later we added codes to catch
"(existing->state == STATE_OPEN || existing->state == STATE_STANDBY)"
before asserting.

Backport: dumpling, firefly, giant

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
2015-02-26 12:43:42 +08:00
Yan, Zheng
8ea5a811b3 client: re-send requsets before composing the cap reconnect message
After commit 419800fe (client: re-send request when MDS enters reconnecting
stage), cephfs client can send both unsafe requests and normal requests when
MDS is in reconnecting stage. Normal requests can have embedded cap releases,
the client code encodes these embedded cap releases after composing the cap
reconnect message. This causes the client sliently drop some caps. The fix
is re-send requsets (which add embedded cap releases) before composing the
cap reconnect message

Fixes: #10912
Signed-off-by: Yan, Zheng <zyan@redhat.com>
2015-02-26 12:12:30 +08:00
Josh Durgin
01099766d7 Merge remote-tracking branch 'origin/hammer' 2015-02-25 18:52:36 -08:00
Josh Durgin
32fd355086 Merge pull request #3796 from ceph/wip-librbd-async-operations
librbd: better handling for async maintenance requests

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-02-25 18:52:19 -08:00
Jason Dillaman
6db92330d2 Merge pull request #3791 from ceph/wip-librbd-mdlock
librbd: fix object map locking

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2015-02-25 21:37:48 -05:00
Loic Dachary
e285d87014 Merge pull request #3801 from ceph/wip-fix-typo-troubleshooting
doc: fix typo deebug

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-02-26 02:43:53 +01:00
Josh Durgin
ec26f086cc librbd: remove unnecessary md_lock usage
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
2015-02-25 17:42:13 -08:00
Josh Durgin
1f9782ea3c librbd: move object_map_lock acquisition into refresh()
Every caller was acquiring this just for these calls.

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
2015-02-25 17:40:25 -08:00
Gregory Meno
40be1404f5 doc: fix typo deebug
Signed-off-by: Gregory Meno <gmeno@redhat.com>
2015-02-25 17:30:33 -08:00
Josh Durgin
27e5ae603b librbd: don't check if object map is enabled before refreshing
This check is now done internally by the object map.

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
2015-02-25 17:27:34 -08:00
Josh Durgin
876f128f8b librbd: remove object map on rollback if needed
When rolling back to a snapshot that did not have object map enabled,
delete the head object map.

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
2015-02-25 17:27:34 -08:00
Josh Durgin
f4d8d16fbb librbd: clarify md_lock usage
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
2015-02-25 17:27:34 -08:00
Josh Durgin
01dc05b931 test_librbd: add simple test for object map snapshot consistency
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
2015-02-25 17:27:34 -08:00
Josh Durgin
85825008bc librbd: use snap_lock to protect ImageCtx->size
Since this is often looked up by snap_id anyway, snap_lock
is easy to use for this.

This lets us avoid taking md_lock in many places.

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
2015-02-25 17:27:34 -08:00
Josh Durgin
7fed0a366d librbd: hold snap_lock while reading parent info in diff_iterate
Caught be the re-added assertions in ImageCtx::get_parent_info()

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
2015-02-25 17:27:34 -08:00