]>
git.apps.os.sepia.ceph.com Git - ceph.git/log
Kefu Chai [Sat, 29 Oct 2016 17:19:06 +0000 (01:19 +0800)]
ceph-rest-api: understand the new style entity_addr_t representation
the new entity_addr_t representation was introduced by
3561eb3 , we
should update ceph_rest_api.py accordingly.
Fixes: http://tracker.ceph.com/issues/17742
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Fri, 28 Oct 2016 13:48:39 +0000 (21:48 +0800)]
Merge pull request #11677 from ceph/wip-rocksdb-no-march-native
rocksdb: do not build with --march=native
Reviewed-by: Bassam Tabbara <bassam.tabbara@quantum.com>
Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
Jason Dillaman [Fri, 28 Oct 2016 13:23:18 +0000 (09:23 -0400)]
Merge pull request #11678 from tchaikov/wip-silence-rbd-warning
librbd: silence the unused variable warning
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Kefu Chai [Fri, 28 Oct 2016 12:28:26 +0000 (20:28 +0800)]
librbd: silence the unused variable warning
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Fri, 28 Oct 2016 11:00:10 +0000 (19:00 +0800)]
rocksdb: do not build with --march=native
we can not assume that building host has the same arch (or the same cpu
capability) with the target machine.
Signed-off-by: Kefu Chai <kchai@redhat.com>
Sage Weil [Fri, 28 Oct 2016 10:52:23 +0000 (05:52 -0500)]
Merge pull request #11663 from stiopaa1/mds_mdslog_addConstToMemFunc
mds/MDLog: add const to member functions
Sage Weil [Fri, 28 Oct 2016 10:49:25 +0000 (05:49 -0500)]
Merge pull request #11668 from Enproduktion/master
doc: Fixed mapping error in legacy mds command
John Spray [Fri, 28 Oct 2016 10:03:12 +0000 (11:03 +0100)]
Merge pull request #11446 from ukernel/wip-cephfs-scan-links
tools/cephfs: add scan_links command which fixes linkages errors
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
John Spray [Fri, 28 Oct 2016 10:01:59 +0000 (11:01 +0100)]
Merge pull request #11609 from stiopaa1/mds_snaprealm_unneededuseofcount
mds/SnapRealm: remove unneeded use of count
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
John Spray [Fri, 28 Oct 2016 10:01:34 +0000 (11:01 +0100)]
Merge pull request #11625 from stiopaa1/mds_damageTable_removeUnneededCount
mds/DamageTable.cc: remove unneeded use of count
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Kefu Chai [Fri, 28 Oct 2016 09:21:09 +0000 (17:21 +0800)]
Merge pull request #9304 from dzafman/wip-13937
osd: handle EC recovery read errors
Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Venky Shankar [Fri, 28 Oct 2016 08:56:49 +0000 (14:26 +0530)]
Merge pull request #11645 from dillaman/wip-librbd-discard-after-write
test: new librbd discard after write test case
Yan, Zheng [Fri, 28 Oct 2016 07:31:40 +0000 (02:31 -0500)]
Merge pull request #11670 from stiopaa1/mds_mutation_addConstToMemFun
mds/Mutation.h: add const to member functions
Yan, Zheng [Fri, 28 Oct 2016 07:25:53 +0000 (02:25 -0500)]
Merge pull request #11608 from atheism/mds-duplicated-check
client: Client.cc: remove duplicated op type checking against CEPH_MD…
Weibing Zhang [Sat, 22 Oct 2016 11:40:10 +0000 (19:40 +0800)]
client: Client.cc: correct the op type checking for CEPH_MDS_OP_CREATE
Signed-off-by: Weibing Zhang <zhangweibing@unitedstack.com>
David Zafman [Thu, 27 Oct 2016 23:12:41 +0000 (16:12 -0700)]
global: Always log loading erasure code for tests
Fix for broken test-erasure-code.sh and test-erasure-eio.sh
Signed-off-by: David Zafman <dzafman@redhat.com>
David Zafman [Fri, 14 Oct 2016 23:17:55 +0000 (16:17 -0700)]
test.sh: Make check for flags more robust
Low space broke test, saw "flags nearfull,pauserd,pausewr...."
Signed-off-by: David Zafman <dzafman@redhat.com>
David Zafman [Fri, 22 Jul 2016 00:36:34 +0000 (17:36 -0700)]
test: Remove extra objectstore_tool call which causes a recovery
Caused by:
70e000a9a42c50eda48f5d3b9e432ffc3a70f75b
Signed-off-by: David Zafman <dzafman@redhat.com>
David Zafman [Wed, 15 Jun 2016 03:09:15 +0000 (20:09 -0700)]
test: Handle object removals in a non-racey way
Signed-off-by: David Zafman <dzafman@redhat.com>
David Zafman [Fri, 27 May 2016 05:09:42 +0000 (22:09 -0700)]
osd: Fix hang on unfound object after mark_unfound_lost is done
Signed-off-by: David Zafman <dzafman@redhat.com>
David Zafman [Fri, 20 May 2016 22:20:18 +0000 (15:20 -0700)]
osd: Handle recovery read errors
Fixes: http://tracker.ceph.com/issues/13937
Signed-off-by: David Zafman <dzafman@redhat.com>
David Zafman [Sat, 21 May 2016 01:19:42 +0000 (18:19 -0700)]
osd: Fix log messages
Signed-off-by: David Zafman <dzafman@redhat.com>
David Zafman [Fri, 20 May 2016 20:58:32 +0000 (13:58 -0700)]
osd: CLEANUP: Remove unused pending_read member
Remove unused struct
Signed-off-by: David Zafman <dzafman@redhat.com>
David Zafman [Fri, 20 May 2016 18:51:21 +0000 (11:51 -0700)]
Revert "test: Disable tests due to recovery race"
This reverts commit
5bc55338f5a1645bc651811fae2f89ad855ff86e .
Conflicts:
src/test/Makefile.am (no longer exists)
src/test/erasure-code/Makefile.am (no longer exists)
Signed-off-by: David Zafman <dzafman@redhat.com>
Brad Hubbard [Fri, 28 Oct 2016 04:43:35 +0000 (14:43 +1000)]
Merge pull request #11582 from batrick/ceph-dumpable
core: set dumpable flag after setuid
Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
Michal Jarzabek [Thu, 27 Oct 2016 20:51:30 +0000 (21:51 +0100)]
mds/Mutation.h: add const to member functions
Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
Malte Fiala [Thu, 27 Oct 2016 17:26:34 +0000 (19:26 +0200)]
doc: Fixed mapping error in legacy mds command
Signed-off-by: Malte Fiala <maltefiala@produktion.io>
Sage Weil [Thu, 27 Oct 2016 16:37:54 +0000 (11:37 -0500)]
Merge pull request #11666 from tchaikov/wip-cmake
cmake: remove include/Makefile.am
Kefu Chai [Thu, 27 Oct 2016 08:37:46 +0000 (16:37 +0800)]
cmake: remove include/Makefile.am
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Thu, 27 Oct 2016 05:01:17 +0000 (13:01 +0800)]
Merge pull request #11638 from tchaikov/wip-clang
include/enc: make clang happy
Reviewed-by: Sage Weil <sage@redhat.com>
Josh Durgin [Wed, 26 Oct 2016 23:17:56 +0000 (16:17 -0700)]
Merge pull request #11658 from hjwsm1989/doc
doc: change the osd_max_backfills default to 1
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Michal Jarzabek [Wed, 26 Oct 2016 21:13:48 +0000 (22:13 +0100)]
mds/MDLog: add const to member functions
Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
John Spray [Wed, 26 Oct 2016 19:31:28 +0000 (20:31 +0100)]
Merge pull request #10887 from michaelsevilla/mantle
fs: Mantle: A Programmable Metadata Load Balancer
Reviewed-by: John Spray <john.spray@redhat.com>
Jason Dillaman [Wed, 26 Oct 2016 15:35:59 +0000 (11:35 -0400)]
Merge pull request #11641 from vshankar/rbd-data-pool-assert
librbd: possible assert failure creating image when using data pool
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Kefu Chai [Tue, 25 Oct 2016 08:25:39 +0000 (16:25 +0800)]
common/cmdparse,msg/async: remove unnecessary std::move()
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Wed, 26 Oct 2016 14:37:41 +0000 (22:37 +0800)]
Merge pull request #11570 from tchaikov/wip-revise-SubmittingPatches
doc: reformat SubmittingPatches with more rst syntax
Reviewed-by: Nathan Cutler <ncutler@suse.com>
Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
Orit Wasserman [Wed, 26 Oct 2016 13:46:18 +0000 (15:46 +0200)]
Merge pull request #11630 from cbodley/wip-rgw-curl-upgrade
rgw: remove suggestion to upgrade libcurl
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
Kefu Chai [Wed, 26 Oct 2016 10:48:33 +0000 (18:48 +0800)]
Merge pull request #11385 from bassamtabbara/wip-rocksdb-external-project
cmake: use external project for rocksdb
Reviewed-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Wed, 26 Oct 2016 09:53:22 +0000 (17:53 +0800)]
doc: remove ending period in section titles
Signed-off-by: Kefu Chai <kchai@redhat.com>
huangjun [Wed, 26 Oct 2016 08:55:53 +0000 (16:55 +0800)]
doc: change the osd_max_backfills default to 1
Fixes: http://tracker.ceph.com/issues/17701
Signed-off-by: huangjun <hjwsm1989@gmail.com>
Kefu Chai [Wed, 26 Oct 2016 07:39:42 +0000 (15:39 +0800)]
Merge pull request #11653 from ktdreyer/doc-epel-instructions
doc: standardize EPEL instructions
Reviewed-by: Kefu Chai <kchai@redhat.com>
Bassam Tabbara [Tue, 11 Oct 2016 05:56:18 +0000 (22:56 -0700)]
cmake: use external project for rocksdb
This commit makes rocksdb an external cmake project. This ensures
that rocksdb is no longer built from src/rocksdb, and that make clean
works correctly.
Signed-off-by: Bassam Tabbara <bassam.tabbara@quantum.com>
Bassam Tabbara [Tue, 11 Oct 2016 06:04:18 +0000 (23:04 -0700)]
pickup new rocksdb with support for linux cmake
This picksup a new version of rocksdb with support for
linux cmake.
Signed-off-by: Bassam Tabbara <bassam.tabbara@quantum.com>
Kefu Chai [Wed, 26 Oct 2016 07:02:51 +0000 (15:02 +0800)]
Merge pull request #11619 from dachary/wip-17662-ceph-disk
ceph-disk: allow using a regular file as a journal
Reviewed-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Wed, 26 Oct 2016 05:53:27 +0000 (13:53 +0800)]
Merge pull request #11652 from ktdreyer/doc-mgr-syntax
doc: fix mgr literal block rST syntax
Reviewed-by: Kefu Chai <kchai@redhat.com>
Venky Shankar [Mon, 24 Oct 2016 13:16:42 +0000 (18:46 +0530)]
librbd: assert failure when using data pool
This fixes a silly assert that's hit during image creation
(cli/api) when the data pool specified is same as the pool
specified by -p/--pool option (or the default).
Signed-off-by: Venky Shankar <vshankar@redhat.com>
Ken Dreyer [Wed, 26 Oct 2016 02:00:48 +0000 (20:00 -0600)]
doc: standardize EPEL instructions
Prior to this change, the documentation pages contained different ways
to enable EPEL. Pick a simple, secure (https) way and standardize on
that.
Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
Ken Dreyer [Wed, 26 Oct 2016 01:44:57 +0000 (19:44 -0600)]
doc: fix mgr literal block rST syntax
Prior to this change, there were double-colon ("::") characters in the
HTML docs to indicate literal blocks.
The proceeding paragraphs were not pre-formatted because there was no
newline between the double-colon and the to-be-pre-formatted paragraph.
Move the "::" characters inline to simplify the syntax and make Sphinx
properly interpret these texts as literal blocks.
Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
Yehuda Sadeh [Tue, 25 Oct 2016 22:06:54 +0000 (15:06 -0700)]
Merge pull request #11594 from cbodley/wip-rgw-init-bucket-sync
rgw: fix for passing temporary in InitBucketSyncStatus
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
Yehuda Sadeh [Tue, 25 Oct 2016 22:05:27 +0000 (15:05 -0700)]
Merge pull request #11505 from cbodley/wip-17571
rgw: clean up RGWShardedOmapCRManager on early return
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
Yehuda Sadeh [Tue, 25 Oct 2016 22:04:02 +0000 (15:04 -0700)]
Merge pull request #11504 from cbodley/wip-17568
rgw: RGWSimpleRadosReadCR tolerates empty reads
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
Michael Sevilla [Fri, 30 Sep 2016 05:01:41 +0000 (22:01 -0700)]
mantle: re-design and fixes
- fix legacy encoding in mds map and add balancer to dumps
- fix blocking rados read and remove temporary files
- fix beacon message spamming
Signed-off-by: Michael Sevilla <mikesevilla3@gmail.com>
Michael Sevilla [Tue, 2 Feb 2016 19:25:42 +0000 (11:25 -0800)]
mantle: store balancer in RADOS, balancer version in MDSMap
- add docs and sample balancer (greedy-spill)
Signed-off-by: Michael Sevilla <mikesevilla3@gmail.com>
Michael Sevilla [Mon, 25 Jul 2016 20:15:13 +0000 (13:15 -0700)]
mantle: write balancer policies in Lua
Introduces Mantle, a programmable metadata load balancer. Policies for making
migration decisions are written in Lua but the Migrator and Balancer modules
still do fragmentation and migration. If the Lua balancer fails, control falls
back to the original balancer implementation.
Signed-off-by: Michael Sevilla <mikesevilla3@gmail.com>
John Wilkins [Tue, 25 Oct 2016 19:26:31 +0000 (12:26 -0700)]
Merge pull request #11352 from dachary/wip-17526-rados-bench
doc: document hostname constraints for rados bench
reviewed-by: John Wilkins <jowilkin@redhat.com>
John Wilkins [Tue, 25 Oct 2016 19:23:31 +0000 (12:23 -0700)]
Merge pull request #11602 from dillaman/wip-17665
doc: clarify QEMU rbd cache settings
reviewed-by: John Wilkins <jowilkin@redhat.com>
Kefu Chai [Tue, 25 Oct 2016 17:38:01 +0000 (01:38 +0800)]
Merge pull request #9825 from liewegas/wip-addrvec
msg: add entity_addr_t types; add new entity_addrvec_t type
Reviewed-by: Kefu Chai <kchai@redhat.com>
Jason Dillaman [Tue, 25 Oct 2016 13:55:32 +0000 (09:55 -0400)]
test: new librbd discard after write test case
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
John Spray [Tue, 25 Oct 2016 11:30:42 +0000 (12:30 +0100)]
Merge pull request #11517 from ukernel/wip-17562
Fix #17562 (backtrace check fails when scrubbing directory created by fsstress)
Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
John Spray [Tue, 25 Oct 2016 11:16:05 +0000 (12:16 +0100)]
Merge pull request #11593 from ukernel/wip-17275
osdc/ObjectCacher: wake up dirty stat waiters after removing buffers
Reviewed-by: John Spray <john.spray@redhat.com>
John Spray [Tue, 25 Oct 2016 11:15:30 +0000 (12:15 +0100)]
Merge pull request #11604 from stiopaa1/mds_inotable_addOverride
mds/InoTable.h: add override to virtual functs
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
John Spray [Tue, 25 Oct 2016 11:14:42 +0000 (12:14 +0100)]
Merge pull request #11613 from stiopaa1/mds_cdir_removeUnneededUseofCount
mds/CDir.cc: remove unneeded use of count
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
John Spray [Tue, 25 Oct 2016 11:14:23 +0000 (12:14 +0100)]
Merge pull request #11611 from batrick/i17670
mds: check if down mds is known
Reviewed-by: John Spray <john.spray@redhat.com>
John Spray [Tue, 25 Oct 2016 10:59:11 +0000 (11:59 +0100)]
Merge pull request #11191 from renhwztetecs/renhw-wip-add-libcephfs
libcephfs: add ceph_fsetattr&&ceph_lchmod&&ceph_lutime
Reviewed-by: John Spray <john.spray@redhat.com>
John Spray [Tue, 25 Oct 2016 10:58:42 +0000 (11:58 +0100)]
Merge pull request #11560 from ukernel/wip-mds-context-wrapping
MDS: reduce usage of context wrapper
Reviewed-by: John Spray <john.spray@redhat.com>
Kefu Chai [Tue, 25 Oct 2016 08:02:33 +0000 (16:02 +0800)]
Merge pull request #11345 from jcsp/wip-mgr-assert
messages: fix out of range assertion
Reviewed-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Tue, 25 Oct 2016 04:26:20 +0000 (12:26 +0800)]
test/encoding: fix the build with clang
put the overloaded operator<<() into namespace std, so clang's name
resolution is able to find it.
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Tue, 25 Oct 2016 04:20:51 +0000 (12:20 +0800)]
cmake: add definitions for glibc
"-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64" is not for gcc, it's for glibc
actually. so enable it on LINUX.
Signed-off-by: Kefu Chai <kchai@redhat.com>
Sage Weil [Fri, 21 Oct 2016 22:15:46 +0000 (18:15 -0400)]
include/denc: cast (possible) ints to bool in enable_if
This makes clang happy.
Signed-off-by: Sage Weil <sage@redhat.com>
Jason Dillaman [Tue, 25 Oct 2016 03:55:17 +0000 (23:55 -0400)]
Merge pull request #11632 from VictorDenisov/group_pool_fix
rbd: fix parsing of group and image specific pools
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Victor Denisov [Mon, 24 Oct 2016 23:50:19 +0000 (16:50 -0700)]
rbd: fix parsing of group and image specific pools
Signed-off-by: Victor Denisov <denisovenator@gmail.com>
Yuri Weinstein [Mon, 24 Oct 2016 21:45:42 +0000 (14:45 -0700)]
Merge pull request #11036 from tomy-ac/wip-tc-rados_append
Added append functionality to rados tool.
Reviewed-by: Samuel Just <sjust@redhat.com>
Yuri Weinstein [Mon, 24 Oct 2016 21:45:00 +0000 (14:45 -0700)]
Merge pull request #11221 from stiopaa1/osd_osdmap_removeUseOfCount
osd/OSDMap.cc: remove unneeded use of count
Reviewed-by: Kefu Chai <kchai@redhat.com>
Yuri Weinstein [Mon, 24 Oct 2016 21:44:04 +0000 (14:44 -0700)]
Merge pull request #11388 from ukernel/wip-17177
os/ObjectStore: properly clear object map when replaying OP_REMOVE
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
Casey Bodley [Mon, 24 Oct 2016 19:02:39 +0000 (15:02 -0400)]
rgw: remove suggestion to upgrade libcurl
Reported-by: Ken Dreyer <kdreyer@redhat.com>
Signed-off-by: Casey Bodley <cbodley@redhat.com>
Michal Jarzabek [Sun, 23 Oct 2016 18:40:44 +0000 (19:40 +0100)]
mds/DamageTable.cc: remove unneeded use of count
Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
Kefu Chai [Mon, 24 Oct 2016 16:16:17 +0000 (00:16 +0800)]
Merge pull request #11143 from kylinstorage/wip-fix-write-hang
osd: fix rados write op hang
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Kefu Chai [Mon, 24 Oct 2016 16:15:30 +0000 (00:15 +0800)]
Merge pull request #11532 from javeme/run_in_thread-return
pybind: avoid "exception 'int' object is not iterable"
Reviewed-by: Kefu Chai <kchai@redhat.com>
Sage Weil [Mon, 24 Oct 2016 16:10:54 +0000 (11:10 -0500)]
Merge pull request #11610 from liewegas/wip-mon-forward-features
messages/MForward: reencode forwarded message if target has differing features
Reviewed-by: Kefu Chai <kchai@redhat.com>
Sage Weil [Sun, 23 Oct 2016 23:10:00 +0000 (18:10 -0500)]
msg/Message: fix set_middle vs throttler
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Sun, 23 Oct 2016 23:40:57 +0000 (18:40 -0500)]
msg: adjust byte_throttler from Message::encode
Normally we never call encode on a message that has a byte_throttler set
because we only use it for messages we received. However, for forwarded
messages that we clear_payload() before resending, we *do* reencode, and in
that case we need to retake the appropriate number of bytes from the
throttler--just like we release them in clear_payload().
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Sat, 22 Oct 2016 18:01:34 +0000 (14:01 -0400)]
messages/MForward: reencode forwarded message if target has differing features
This ensures we reencode the payload with the
appropriate set of features if the client, us, or the
target do not have identical features. Otherwise we
may forward an encoding with more features than the
target can handle.
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Mon, 24 Oct 2016 16:08:06 +0000 (11:08 -0500)]
Merge pull request #11595 from liewegas/wip-move-ranges
os: fix offsets for move_ranges operation
Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
Jason Dillaman [Mon, 24 Oct 2016 15:55:48 +0000 (11:55 -0400)]
Merge pull request #11160 from VictorDenisov/consistency_groups_namespaces
librbd: add support for snapshot namespaces
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Jayashree Candadai [Fri, 21 Oct 2016 17:52:05 +0000 (13:52 -0400)]
ceph-disk: allow using a regular file as a journal
Because of a missing return, ceph-disk prepare would fail if given a
regular file as a journal. If the journal file does not exist, ceph-disk
will create it but fail to ensure that the ceph user owns it. The
symlink to the journal file is not set when the journal file is
specified on the command line and the journal file does not exist at
all. The ceph-osd daemon will silently create it as a file but it will
not be the file given in argument.
Add a test case to verify using a regular file as a journal works as
expected.
Fixes: http://tracker.ceph.com/issues/17662
Signed-off-by: Jayashree Candadai <jayaajay@indiana.edu>
Signed-off-by: Loic Dachary <ldachary@redhat.com>
John Spray [Mon, 24 Oct 2016 12:36:32 +0000 (13:36 +0100)]
mds: fix compile error from merges
Two patches both added these definitions
in slightly different places, so git let them
merge without a conflict.
Signed-off-by: John Spray <john.spray@redhat.com>
John Spray [Mon, 24 Oct 2016 11:02:48 +0000 (12:02 +0100)]
Merge remote-tracking branch 'ukernel/wip-mdstypes-split'
John Spray [Mon, 24 Oct 2016 11:00:48 +0000 (12:00 +0100)]
Merge pull request #11576 from ukernel/wip-17636-debug
mds: add debug assertion for issue #17636
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
John Spray [Mon, 24 Oct 2016 10:53:47 +0000 (11:53 +0100)]
Merge pull request #11578 from jcsp/wip-backtrace-repair
mds: repair backtraces during scrub
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Sage Weil [Mon, 24 Oct 2016 10:28:44 +0000 (05:28 -0500)]
Merge pull request #11596 from liewegas/wip-osdmap-features
mon/OSDMonitor: encode OSDMap::Incremental with same features as OSDMap
Reviewed-by: Kefu Chai <kchai@redhat.com>
Sage Weil [Fri, 21 Oct 2016 16:46:11 +0000 (12:46 -0400)]
unittest_bluestore_types: fix csum const name
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Mon, 24 Oct 2016 09:57:34 +0000 (04:57 -0500)]
Merge branch 'wip-bluestore-per-pool-compress2' of https://github.com/ifed01/ceph
Yan, Zheng [Wed, 12 Oct 2016 13:42:49 +0000 (21:42 +0800)]
tools/cephfs: add 'scan_links' command which fixes linkages errors
Signed-off-by: Yan, Zheng <zyan@redhat.com>
Kefu Chai [Mon, 24 Oct 2016 03:15:12 +0000 (11:15 +0800)]
Merge pull request #8751 from flyd1005/wip-fix-typo
doc: fix typos
Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
Loic Dachary [Sun, 23 Oct 2016 21:32:34 +0000 (23:32 +0200)]
Merge pull request #10955 from objoo/YD-mailmap-updates-Sept
mailmap updates sept
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Michal Jarzabek [Sun, 23 Oct 2016 10:24:14 +0000 (11:24 +0100)]
mds/CDir.cc: remove unneeded use of count
Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
Patrick Donnelly [Sat, 22 Oct 2016 22:47:03 +0000 (18:47 -0400)]
mds: check if down mds is known
This avoids an assertion failure where an MDS receives an mdsmap that
causes it to enter up:replay and also see another MDS go down.
Fixes: http://tracker.ceph.com/issues/17670
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
Michal Jarzabek [Sat, 22 Oct 2016 16:26:29 +0000 (17:26 +0100)]
mds/SnapRealm: remove unneeded use of count
Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
Sage Weil [Sat, 22 Oct 2016 14:54:54 +0000 (09:54 -0500)]
Merge pull request #11607 from xiexingguo/xxg-wip-bluestore-1022
os/bluestore: simplify can_split_at()
Reviewed-by: Sage Weil <sage@redhat.com>
xie xingguo [Sat, 22 Oct 2016 06:14:41 +0000 (14:14 +0800)]
os/bluestore: literal changes
1. drop redundant semicolon
2. fix wrong output message
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>