]>
git.apps.os.sepia.ceph.com Git - ceph.git/log
shawn [Fri, 20 May 2016 02:37:49 +0000 (22:37 -0400)]
tool: change affected file include relation by mon file header optimize
Signed-off-by: Xiaowei Chen <chen.xiaowei@h3c.com>
cxwshawn [Thu, 19 May 2016 05:03:29 +0000 (13:03 +0800)]
MON: optimize header file dependency.
same work as PR: https://github.com/ceph/ceph/pull/9161
Signed-off-by: Xiaowei Chen <chen.xiaowei@h3c.com>
Samuel Just [Thu, 19 May 2016 23:08:32 +0000 (16:08 -0700)]
Merge pull request #9108 from tchaikov/wip-13990
osd: reset session->osdmap if waiting_for_pg is empty
Reviewed-by: Samuel Just <sjust@redhat.com>
Gregory Farnum [Thu, 19 May 2016 22:34:21 +0000 (15:34 -0700)]
Merge pull request #8908 from jcsp/wip-15705
mds: fix mdsmap print_summary with standby replays
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Sage Weil [Thu, 19 May 2016 20:01:10 +0000 (16:01 -0400)]
Merge pull request #9199 from jmunhoz/mc-brp-aws4
doc: rgw: minor cleanup and doc update
Casey Bodley [Thu, 19 May 2016 15:16:48 +0000 (11:16 -0400)]
Merge pull request #9133 from tchaikov/wip-cmake-selinux
cmake: add selinux support
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Casey Bodley [Thu, 19 May 2016 13:33:45 +0000 (09:33 -0400)]
Merge pull request #9192 from tchaikov/cmake-object-library
cmake: use object library instead recompiling popular .cc files
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Orit Wasserman [Thu, 19 May 2016 09:54:40 +0000 (11:54 +0200)]
Merge pull request #9146 from cbodley/wip-rgw-period-push
radosgw-admin: fix 'period push' handling of --url
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
Javier M. Mellid [Thu, 19 May 2016 08:48:25 +0000 (10:48 +0200)]
rgw: doc: bucket request payment update
S3 doc update.
The bucket request payment feature is available in Jewel
commits:
899d7754fe15ab8635fb506fcadafa8e5e92c376
461bd7fa08710be994c522c4d173a4151dbc173a
Signed-off-by: Javier M. Mellid <jmunhoz@igalia.com>
Javier M. Mellid [Thu, 19 May 2016 08:13:35 +0000 (10:13 +0200)]
rgw: aws4: fix log message
With the UNSIGNED-PAYLOAD bugfix in place this log message requires an update.
Requests asking for unsigned payloads don't need any completion handler so
notifying about body detection in this point is not accurate.
Signed-off-by: Javier M. Mellid <jmunhoz@igalia.com>
Sage Weil [Thu, 19 May 2016 08:21:36 +0000 (04:21 -0400)]
Merge pull request #8553 from yatinkumbhare/doc-fix
doc: fix broken link for bootstrapping monitors
Loic Dachary [Thu, 19 May 2016 07:09:49 +0000 (09:09 +0200)]
Merge pull request #9182 from objoo/YD-mailmap-updates-MAY
Leftover of previous mailmap not merged.
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Kefu Chai [Thu, 19 May 2016 05:08:22 +0000 (13:08 +0800)]
Merge pull request #9143 from tchaikov/wip-osdmaptool-man
man: osdmaptool: document test-map-pgs* options
Reviewed-by: Vikhyat Umrao <vumrao@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Kefu Chai [Thu, 19 May 2016 04:49:58 +0000 (12:49 +0800)]
cmake: make common/TextTable.cc an object library
so we don't recompile it whenever it is used.
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Thu, 19 May 2016 04:23:10 +0000 (12:23 +0800)]
cmake: reuse secret.c's object library
so we don't need to recompile it when using it.
Signed-off-by: Kefu Chai <kchai@redhat.com>
Tamilarasi Muthamizhan [Thu, 19 May 2016 01:03:32 +0000 (18:03 -0700)]
Merge pull request #9153 from ceph/openstack_wusui
OpenStack setup scripts.
Yehuda Sadeh [Wed, 18 May 2016 23:36:10 +0000 (16:36 -0700)]
Merge pull request #8669 from dreamhost/wip-15532
rgw/s3website: ErrorDoc & Double-fault support
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
Sage Weil [Wed, 18 May 2016 21:07:18 +0000 (17:07 -0400)]
Merge pull request #9150 from stiopaa1/compatset_removeIncludeVector_mc
common: CompatSet.h: remove unneeded #include<vector>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Sage Weil [Wed, 18 May 2016 21:03:52 +0000 (17:03 -0400)]
Merge pull request #9158 from cxwshawn/wip-tc-fix
osd: erase duplicated header include
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Wed, 18 May 2016 21:02:14 +0000 (17:02 -0400)]
Merge pull request #9169 from stiopaa1/osd_hitSetRemoveFormatterInclude
osd/HitSet: remove unneeded #include - Formatter
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Wed, 18 May 2016 21:01:17 +0000 (17:01 -0400)]
Merge pull request #9186 from stiopaa1/osd_fixTypoInComment
osd/OSD.h: fix typo in comment
Michal Jarzabek [Sun, 15 May 2016 08:46:14 +0000 (09:46 +0100)]
osd/OSD.h: fix typo in comment
Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
Yann Dupont [Wed, 18 May 2016 20:30:34 +0000 (22:30 +0200)]
mailmap: Luo Runbing affiliation (was "runsisi", name normalization between Huazhong University of Science and Technology part & ZTE .)
Signed-off-by: Yann Dupont <yann@objoo.org>
Sage Weil [Wed, 18 May 2016 20:25:08 +0000 (16:25 -0400)]
xio: rename enqueue_for_send() to enqueue()Reviewed-by: Sage Weil <sage@redhat.com>
xio: rename enqueue_for_send() to enqueue()
Reviewed-by: Sage Weil <sage@redhat.com>
Yann Dupont [Wed, 18 May 2016 20:24:21 +0000 (22:24 +0200)]
mailmap: Jenkis affiliation (name normalization)
Signed-off-by: Yann Dupont <yann@objoo.org>
Mykola Golub [Wed, 18 May 2016 20:10:02 +0000 (23:10 +0300)]
Merge pull request #9181 from dillaman/wip-rbd-mirror-test
qa/workunits/rbd: fixed rbd_mirror teuthology runtime errors
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Yann Dupont [Tue, 19 Apr 2016 22:42:21 +0000 (00:42 +0200)]
mailmap: Fangchen Sun affiliation (and name normalisation, was "sunspot")
Signed-off-by: Yann Dupont <yann@objoo.org>
Yann Dupont [Tue, 19 Apr 2016 22:20:35 +0000 (00:20 +0200)]
mailmap: Jacek J. Łakis affiliation (name normalisation)
Signed-off-by: Yann Dupont <yann@objoo.org>
Yann Dupont [Tue, 19 Apr 2016 22:15:34 +0000 (00:15 +0200)]
mailmap: Sangdi Xu affiliation (name normalisation)
Signed-off-by: Yann Dupont <yann@objoo.org>
Yann Dupont [Tue, 19 Apr 2016 21:56:25 +0000 (23:56 +0200)]
mailmap: Roland Mechler affiliation
Signed-off-by: Yann Dupont <yann@objoo.org>
Yann Dupont [Tue, 19 Apr 2016 21:49:20 +0000 (23:49 +0200)]
mailmap: Etienne Menguy affiliation
Signed-off-by: Yann Dupont <yann@objoo.org>
Casey Bodley [Mon, 16 May 2016 13:37:05 +0000 (09:37 -0400)]
radosgw-admin: fix 'period push' handling of --url
was calling send_to_remote_gateway(), but passing 'url' instead of
'remote'. now uses send_to_remote_or_url() to accept either
Fixes: http://tracker.ceph.com/issues/15926
Signed-off-by: Casey Bodley <cbodley@redhat.com>
Jason Dillaman [Wed, 18 May 2016 18:17:13 +0000 (14:17 -0400)]
qa/workunits/rbd: fixed rbd_mirror teuthology runtime errors
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Warren Usui [Wed, 18 May 2016 18:27:10 +0000 (11:27 -0700)]
Add date to README
Samuel Just [Wed, 18 May 2016 17:38:31 +0000 (10:38 -0700)]
Merge pull request #8307 from songbaisen/song16
mon: paxos small optimization on store_state
Reviewed-by: Kefu Chai <kchai@redhat.com>
Samuel Just [Wed, 18 May 2016 17:35:23 +0000 (10:35 -0700)]
Pipe: take a ref to existing while we are waiting
Pipe: take a ref to existing while we are waiting
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Sage Weil [Wed, 18 May 2016 17:34:38 +0000 (13:34 -0400)]
Merge pull request #9159 from tchaikov/wip-kill-warnings
osd,auth: silence "-Wmisleading-indentation" warnings
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Mykola Golub [Wed, 18 May 2016 17:29:22 +0000 (20:29 +0300)]
journal: live replay might skip entries from previous object setReviewed-by: Mykola Golub <mgolub@mirantis.com>
journal: live replay might skip entries from previous object set
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Jason Dillaman [Wed, 18 May 2016 17:21:19 +0000 (13:21 -0400)]
Merge pull request #9092 from trociny/wip-15746
doc: update mirroring guide to include pool/image status commands
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Jason Dillaman [Tue, 17 May 2016 01:17:09 +0000 (21:17 -0400)]
qa/workunits/rbd: rbd-mirror daemon stress test
This test repeatedly runs rbd bench-write, kills the process
randomly to create an unclean journal shutdown, and verifies
that the image content replicates correctly.
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Jason Dillaman [Sun, 15 May 2016 13:52:41 +0000 (09:52 -0400)]
journal: skip partially complete tag entries during playback
If a journal client does not fully write out its buffered entries
before quiting, replay should skip over all remaining out-of-
sequence entries for the tag.
Fixes: http://tracker.ceph.com/issues/15864
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Jason Dillaman [Mon, 16 May 2016 22:08:35 +0000 (18:08 -0400)]
journal: helper method to detect newer tags
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Jason Dillaman [Sat, 14 May 2016 22:58:41 +0000 (18:58 -0400)]
journal: close, advance, and open object set ordering
Flush in-flight appends to open objects before advancing the
active object set. Additionally, don't start recording to the
new objects until after advancing the active set.
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Jason Dillaman [Sat, 14 May 2016 22:13:38 +0000 (18:13 -0400)]
journal: new ObjectRecorder closed callback
The callback will be invoked if there were in-flight appends
when the close was requested.
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Jason Dillaman [Fri, 13 May 2016 20:34:44 +0000 (16:34 -0400)]
journal: do not flag append as full if already known to be full
Once an object has overflowed or a close is in-progress, re-attempting
to close the object is not needed since the async process is already
underway.
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Jason Dillaman [Fri, 13 May 2016 20:28:50 +0000 (16:28 -0400)]
journal: delay object overflow event until in-flight appends settled
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Jason Dillaman [Fri, 13 May 2016 20:17:37 +0000 (16:17 -0400)]
journal: ignore flush on closed/overflowed object
The journal would be in-progress on transitioning to a new
object recorder in a newer object set. Once the records
re-attach to the new object player they will automatically
flush.
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Jason Dillaman [Fri, 13 May 2016 20:10:11 +0000 (16:10 -0400)]
journal: implicitly detach future's flush handler on append
If the future is already in-flight, there is no purpose served
by requesting the future be flushed to disk.
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Jason Dillaman [Fri, 13 May 2016 19:22:30 +0000 (15:22 -0400)]
journal: async callback for advancing the active object set
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Jason Dillaman [Fri, 13 May 2016 18:49:07 +0000 (14:49 -0400)]
journal: re-fetch active object before advancing set during replay
During a live replay, it's possible that an append and and overflow
into the next object could race with the live playback of the same
object. Re-fetch an "empty" object at least once before advancing
to next set to ensure all records have been read.
Fixes: http://tracker.ceph.com/issues/15665
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
John Spray [Wed, 18 May 2016 13:20:22 +0000 (14:20 +0100)]
Merge pull request #8747 from jcsp/wip-15599
client: report root's quota in statfs (#15599)
Reviewed-by: Yan, Zheng <zyan@redhat.com>
John Spray [Wed, 18 May 2016 13:18:17 +0000 (14:18 +0100)]
Merge pull request #8582 from ukernel/wip-trim-purging
MDS: don't pin purging denties
Reviewed-by: John Spray <john.spray@redhat.com>
Sage Weil [Wed, 18 May 2016 06:22:06 +0000 (02:22 -0400)]
Merge pull request #9166 from chhabaramesh/master
os/bluestore/BitmapFreelistManager: fix length calculation
Reviewed-by: Sage Weil <sage@redhat.com>
Ramesh Chander [Tue, 17 May 2016 09:51:25 +0000 (02:51 -0700)]
fixing wrong length cal in BitmapFreelist
Signed-off-by: Ramesh Chander <Ramesh.Chander@sandisk.com>
Kefu Chai [Mon, 16 May 2016 10:57:43 +0000 (18:57 +0800)]
man: osdmaptool: document test-map-pgs* options
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Wed, 18 May 2016 02:11:54 +0000 (10:11 +0800)]
Merge pull request #8350 from songbaisen/song17
mon: do not alloc monmap on heap in Elector::dispatch()
Reviewed-by: Piotr Dałek <piotr.dalek@ts.fujitsu.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Robin H. Johnson [Wed, 18 May 2016 00:38:38 +0000 (17:38 -0700)]
rgw/s3website: whitespace style fixes
Signed-off-by: Robin H. Johnson <robin.johnson@dreamhost.com>
Robin H. Johnson [Wed, 18 May 2016 00:35:41 +0000 (17:35 -0700)]
rgw/s3website: Fix ErrocDoc memory leak.
Yehuda pointed [1] out a memory leak with the RGWGetObj not being handed back, and
suggested that shared_ptr was used to handle it, rather than the prior approach
of explicitly calling handler->put_op.
This commit implements just that change, in isolation from other changes, for
ease of comparision testing.
X-Reference-1: https://github.com/ceph/ceph/pull/8669#discussion_r63445516
Signed-off-by: Robin H. Johnson <robin.johnson@dreamhost.com>
Samuel Just [Tue, 17 May 2016 19:02:58 +0000 (12:02 -0700)]
Merge pull request #9026 from badone/wip-log-syslog-info
log: Log.cc: Assign LOG_INFO priority to syslog calls
Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Samuel Just [Tue, 17 May 2016 19:01:55 +0000 (12:01 -0700)]
Merge pull request #8727 from liewegas/wip-collection-attr
osd: remove collection attr methods from ObjectStore interface
Reviewed-by: Samuel Just <sjust@redhat.com>
Samuel Just [Tue, 17 May 2016 18:58:20 +0000 (11:58 -0700)]
Merge pull request #7638 from asheplyakov/filejournal-open-ret
FileJournal::_open: return the correct error code
Reviewed-by: Samuel Just <sjust@redhat.com>
Casey Bodley [Tue, 17 May 2016 18:57:53 +0000 (14:57 -0400)]
Merge pull request #9098 from theanalyst/rgw/bucket-unused-ioctx
rgw_rados: remove unused ioctx for domain root in create_bucket
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Samuel Just [Tue, 17 May 2016 18:57:15 +0000 (11:57 -0700)]
Merge pull request #7306 from branch-predictor/bp-fix-osdmap-loaderr
OSD/OSDService: make osdmap load error more human-understandable
Reviewed-by: Samuel Just <sjust@redhat.com>
Samuel Just [Tue, 17 May 2016 18:56:31 +0000 (11:56 -0700)]
Merge pull request #7118 from efirs/ef_rwlock_for_index_manager
os/fileStore: Replace Mutex with RWLock in IndexManager
Reviewed-by: Samuel Just <sjust@redhat.com>
Samuel Just [Tue, 17 May 2016 18:55:34 +0000 (11:55 -0700)]
Merge pull request #7163 from tchaikov/wip-pr-6085
mon: use CephOsdName for osd args instead of CephInt
Reviewed-by: Sage Weil <sage@redhat.com>
Samuel Just [Tue, 17 May 2016 18:54:12 +0000 (11:54 -0700)]
utime.h: fix timezone issue in round_to_* funcs.Reviewed-by: Samuel Just <sjust@redhat.com>
utime.h: fix timezone issue in round_to_* funcs.
Reviewed-by: Samuel Just <sjust@redhat.com>
Casey Bodley [Tue, 17 May 2016 18:02:34 +0000 (14:02 -0400)]
Merge pull request #8259 from theanalyst/rgw/fix-15234
rgw: return -EACCESS for system requests also
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Casey Bodley [Tue, 17 May 2016 17:52:52 +0000 (13:52 -0400)]
Merge pull request #8892 from flyd1005/wip-boost-starts_with
rgw: cleanup: use boost::algorithm::starts_with to replace our own implementations
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Michal Jarzabek [Mon, 16 May 2016 20:43:21 +0000 (21:43 +0100)]
osd/HitSet: remove unneeded #include - Formatter
Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
Orit Wasserman [Tue, 17 May 2016 13:06:25 +0000 (15:06 +0200)]
Merge pull request #9109 from cbodley/wip-rgw-dup-zone
rgw: radosgw-admin rejects duplicate zone names in a zonegroup
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
John Spray [Wed, 11 May 2016 12:18:23 +0000 (13:18 +0100)]
client: report root's quota in statfs
When user is mounted a quota-restricted inode
as the root, report that inode's quota status
as the filesystem statistics in statfs.
This allows us to have a fairly convincing illusion
that someone has a filesystem to themselves, when
they're really mounting a restricted part of
the larger global filesystem.
Fixes: http://tracker.ceph.com/issues/15599
Signed-off-by: John Spray <john.spray@redhat.com>
Kefu Chai [Tue, 17 May 2016 05:15:10 +0000 (13:15 +0800)]
osd: mark some class members as private
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Thu, 12 May 2016 12:28:11 +0000 (20:28 +0800)]
osd: reset session->osdmap if session is not waiting for a map anymore
we should release the osdmap reference once we are done with it,
otherwise we might need to wait very long to update that reference with
a newer osdmap ref. this appears to be an OSDMap leak: it is held by an
quiet OSD::Session forever.
the osdmap is not reset in OSD::session_notify_pg_create(), because its
only caller is wake_pg_waiters(), which will call
dispatch_session_waiting() later. and dispatch_session_waiting() will
check the session->osdmap, and will also reset the osdmap if
session->waiting_for_pg.empty().
Fixes: http://tracker.ceph.com/issues/13990
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Tue, 17 May 2016 03:18:01 +0000 (11:18 +0800)]
osd,auth: silence "-Wmisleading-indentation" warnings
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Fri, 13 May 2016 03:45:55 +0000 (11:45 +0800)]
Message: make get_orig_*() alias of get_*()
not necessary to construct a entity_inst_t and then throw it away just
for extracting the entity_inst_t::name or entity_inst_t::addr.
Fixes: http://tracker.ceph.com/issues/13990
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Fri, 13 May 2016 03:26:31 +0000 (11:26 +0800)]
osd/OpRequest: reset connection upon unregister
this helps to free the resources referenced by the connection, among
other things, in the case of MOSDOp, the OSD::Session and OSDMap. this
helps to free the resource earlier and trim the osdmaps in time.
Fixes: http://tracker.ceph.com/issues/13990
Signed-off-by: Kefu Chai <kchai@redhat.com>
shawn [Tue, 17 May 2016 03:05:39 +0000 (23:05 -0400)]
OSD: erase duplicated header include
especially osd_types.h, maybe affect compile speed.
Signed-off-by: Xiaowei Chen <chen.xiaowei@h3c.com>
Josh Durgin [Mon, 16 May 2016 23:46:01 +0000 (16:46 -0700)]
test/objectstore/CMakeLists.txt: fix unittes_bit_alloc typoReviewed-by: Josh Durgin <jdurgin@redhat.com>
test/objectstore/CMakeLists.txt: fix unittes_bit_alloc typo
Yehuda Sadeh [Mon, 16 May 2016 23:41:25 +0000 (16:41 -0700)]
Merge pull request #9118 from oritwas/wip-rgw-apache-realm-pull
rgw: fix realm pull and period pull for apache frontend
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
Samuel Just [Mon, 16 May 2016 23:40:43 +0000 (16:40 -0700)]
test/objectstore/CMakeLists.txt: fix unittes_bit_alloc typo
Signed-off-by: Samuel Just <sjust@redhat.com>
Sage Weil [Mon, 16 May 2016 21:53:02 +0000 (17:53 -0400)]
Merge pull request #9152 from liewegas/wip-bitmap-allocator
os/bluestore: bitmap allocator
Reviewed-by: Sage Weil <sage@redhat.com>
Warren Usui [Mon, 16 May 2016 21:33:39 +0000 (14:33 -0700)]
OpenStack setup scripts.
A set of scripts used to bring up an OpenStack instance on one site,
connect a ceph cluster, add pools to store OpenStack glance images,
cinder volumes, nova vms, and cinder backups on rbd, and bring up a nova
compute node.
Ramesh Chander [Tue, 10 May 2016 09:32:24 +0000 (02:32 -0700)]
os/bluestore: bitmap allocator
Signed-off-by: Ramesh Chander <Ramesh.Chander@sandisk.com>
Ramesh Chander [Mon, 16 May 2016 21:28:57 +0000 (17:28 -0400)]
os/bluestore: pass size to allocator
Signed-off-by: Ramesh Chander <Ramesh.Chander@sandisk.com>
Ramesh Chander [Mon, 16 May 2016 21:30:05 +0000 (17:30 -0400)]
os/bluestore: add config for allocator
Signed-off-by: Ramesh Chander <Ramesh.Chander@sandisk.com
Yuri Weinstein [Mon, 16 May 2016 20:43:51 +0000 (13:43 -0700)]
Merge pull request #7787 from wjwithagen/patch-1
clang: common/config.cc basename() requires libgen.h includes
Reviewed-by: Kefu Chai <kchai@redhat.com>
Yuri Weinstein [Mon, 16 May 2016 20:40:48 +0000 (13:40 -0700)]
Merge pull request #8689 from runsisi/wip-fix-ev-sk
msg/async/EventSocket: fix missing break statement
Reviewed-by: Haomai Wang <yuyuyu101@163.com>
Reviewed-by: xiexingguo <xie.xingguo@zte.com.cn>
Yuri Weinstein [Mon, 16 May 2016 20:36:58 +0000 (13:36 -0700)]
Merge pull request #8717 from ZhenyuLeng/noneed_op_is_discardable
osd: make op_is_discardable check optional
Reviewed-by: Sage Weil <sage@redhat.com>
Yuri Weinstein [Mon, 16 May 2016 20:34:49 +0000 (13:34 -0700)]
Merge pull request #8961 from xiexingguo/xxg-wip-fixepochtrunc
osd: don't get inc osdmap name truncated
Reviewed-by: Kefu Chai <kchai@redhat.com>
Yuri Weinstein [Mon, 16 May 2016 20:33:57 +0000 (13:33 -0700)]
Merge pull request #8985 from badone/wip-iops-typo
common: obj_bencher.cc add missing ":"
Reviewed-by: Kefu Chai <kchai@redhat.com>
Yuri Weinstein [Mon, 16 May 2016 20:32:41 +0000 (13:32 -0700)]
Merge pull request #9011 from stiopaa1/osdmap_removeUnneededIncludeFiles
osd/OSDMap.h: remove unneeded include files
Reviewed-by: Sage Weil <sage@redhat.com>
Yuri Weinstein [Mon, 16 May 2016 20:30:49 +0000 (13:30 -0700)]
Merge pull request #9075 from runsisi/wip-compute-cost
osd/ReplicatedBackend: reuse the already computed cost
Reviewed-by: xiexingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Yuri Weinstein [Mon, 16 May 2016 20:27:40 +0000 (13:27 -0700)]
Merge pull request #9077 from liewegas/wip-osd-map-cache
osd: instrument map cache hits and misses
Reviewed-by: xiexingguo <xie.xingguo@zte.com.cn>
Yuri Weinstein [Mon, 16 May 2016 20:20:18 +0000 (13:20 -0700)]
Merge pull request #9078 from liewegas/wip-clean-temps
mon, osdmap: optimize check and cleanup of pg_temp for new osdmaps
Reviewed-by: xiexingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Mon, 16 May 2016 17:07:17 +0000 (01:07 +0800)]
Merge pull request #8298 from wjwithagen/wip-wjw-freebsd-autobuild-2
build: many fixes for freebsd
Reviewed-by: Kefu Chai <kchai@redhat.com>
Sage Weil [Mon, 16 May 2016 17:02:55 +0000 (13:02 -0400)]
Merge pull request #8480 from songbaisen/song19
crush: When consider rule size use the correct method.
Reviewed-by: Kefu Chai <kchai@redhat.com>
Sage Weil [Mon, 16 May 2016 17:02:15 +0000 (13:02 -0400)]
Merge pull request #8974 from liewegas/wip-addr-cleanup
msg/msg_types: clean up entity_addr_t
Reviewed-by: Haomai Wang <haomai@xsky.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Sage Weil [Mon, 16 May 2016 17:01:26 +0000 (13:01 -0400)]
Merge pull request #9027 from roidayan/make-debs_avoid_creating_recursive_conf_dir
make-debs.sh: avoid creating recursive conf dir
Reviewed-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Sun, 15 May 2016 12:39:53 +0000 (20:39 +0800)]
cmake: enable selinux support
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Mon, 16 May 2016 12:58:34 +0000 (20:58 +0800)]
Merge pull request #9144 from vumrao/wip-vumrao-15899
doc : adding explanation of --no-increasing for
Reviewed-by: Kefu Chai <kchai@redhat.com>