]>
git.apps.os.sepia.ceph.com Git - ceph.git/log
Josh Durgin [Tue, 29 Mar 2016 18:18:26 +0000 (11:18 -0700)]
ceph.in: correct dev python path for automake builds
Accidentally broken by
ad2e6f442df0fe302c09fc751fc9e12237789511
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
Orit Wasserman [Tue, 29 Mar 2016 16:35:22 +0000 (18:35 +0200)]
Merge pull request #8351 from jcsp/wip-cmake-cython
cmake: Build cython modules and change paths to bin/, lib/
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
Jason Dillaman [Tue, 29 Mar 2016 14:22:09 +0000 (10:22 -0400)]
Merge pull request #8261 from rjfd/wip-15217
rbd-mirror: enabling/disabling pool mirroring should update the mirroring directory
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
John Spray [Tue, 29 Mar 2016 11:22:00 +0000 (12:22 +0100)]
ceph.in: update for cmake path changes
Signed-off-by: John Spray <john.spray@redhat.com>
John Spray [Thu, 24 Mar 2016 12:30:09 +0000 (12:30 +0000)]
vstart: update for cmake build path changes
Cribbed this from Ali's wip-cmake-make-check branch.
Signed-off-by: John Spray <john.spray@redhat.com>
Ali Maredia [Thu, 3 Mar 2016 17:05:18 +0000 (12:05 -0500)]
cmake: Cython modules building with cmake
Signed-off-by: Ali Maredia <amaredia@redhat.com>
Loic Dachary [Tue, 29 Mar 2016 11:01:23 +0000 (13:01 +0200)]
Merge pull request #8228 from SUSE/wip-15218
doc/dev: add "Deploy a cluster for manual testing" section
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Loic Dachary [Tue, 29 Mar 2016 10:58:56 +0000 (12:58 +0200)]
Merge pull request #8256 from dachary/wip-mailmap
mailmap updates
Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
Loic Dachary [Tue, 29 Mar 2016 10:55:52 +0000 (12:55 +0200)]
mailmap: Adam C. Emerson name normalization
Signed-off-by: Loic Dachary <loic@dachary.org>
Loic Dachary [Tue, 29 Mar 2016 10:55:29 +0000 (12:55 +0200)]
mailmap: Jenkins name normalization
Signed-off-by: Loic Dachary <loic@dachary.org>
Loic Dachary [Tue, 22 Mar 2016 10:37:25 +0000 (11:37 +0100)]
mailmap: Yan Jun affiliation
Signed-off-by: Loic Dachary <loic@dachary.org>
Loic Dachary [Tue, 22 Mar 2016 10:37:01 +0000 (11:37 +0100)]
mailmap: Zhao Junwang affiliation
Signed-off-by: Loic Dachary <loic@dachary.org>
Loic Dachary [Tue, 22 Mar 2016 10:36:46 +0000 (11:36 +0100)]
mailmap: Sarthak Munshi affiliation
Signed-off-by: Loic Dachary <loic@dachary.org>
Loic Dachary [Tue, 22 Mar 2016 10:36:28 +0000 (11:36 +0100)]
mailmap: Rust Shen affiliation
Signed-off-by: Loic Dachary <loic@dachary.org>
Loic Dachary [Tue, 22 Mar 2016 10:36:05 +0000 (11:36 +0100)]
mailmap: Eric Cook affiliation
Signed-off-by: Loic Dachary <loic@dachary.org>
Loic Dachary [Tue, 22 Mar 2016 10:35:45 +0000 (11:35 +0100)]
mailmap: Ricardo Dias affiliation
Signed-off-by: Loic Dachary <loic@dachary.org>
Loic Dachary [Tue, 22 Mar 2016 10:35:27 +0000 (11:35 +0100)]
mailmap: Karol Mroz affiliation
Signed-off-by: Loic Dachary <loic@dachary.org>
Loic Dachary [Tue, 22 Mar 2016 10:35:07 +0000 (11:35 +0100)]
mailmap: James Liu affiliation
Signed-off-by: Loic Dachary <loic@dachary.org>
Loic Dachary [Tue, 22 Mar 2016 10:34:45 +0000 (11:34 +0100)]
mailmap: Robert LeBlanc name normalization
Reviewed-by: Robert LeBlanc <robert.leblanc@endurance.com>
Signed-off-by: Loic Dachary <loic@dachary.org>
Loic Dachary [Tue, 22 Mar 2016 10:34:22 +0000 (11:34 +0100)]
mailmap: Yankun Li name normalization
Reviewed-by: Yankun Li <liyankun@unitedstack.com>
Signed-off-by: Loic Dachary <loic@dachary.org>
Loic Dachary [Tue, 22 Mar 2016 10:33:25 +0000 (11:33 +0100)]
mailmap: Josh Durgin name normalization
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Signed-off-by: Loic Dachary <loic@dachary.org>
Ricardo Dias [Tue, 22 Mar 2016 13:26:15 +0000 (13:26 +0000)]
rbd: rbd-mirroring: Added unit tests to test enable/disable image mirroring when pool-level mirroring changes
Signed-off-by: Ricardo Dias <rdias@suse.com>
Ricardo Dias [Tue, 22 Mar 2016 12:24:03 +0000 (12:24 +0000)]
rbd: rbd-mirroring: Disable image mirroring when pool-level mirroring is disabled
Signed-off-by: Ricardo Dias <rdias@suse.com>
Fixes: #15217
Ricardo Dias [Tue, 22 Mar 2016 11:43:51 +0000 (11:43 +0000)]
rbd: rbd-mirroring: Enable image mirroring when pool-level mirroring is enabled
Signed-off-by: Ricardo Dias <rdias@suse.com>
Loic Dachary [Tue, 29 Mar 2016 08:37:30 +0000 (10:37 +0200)]
Merge pull request #8345 from tchaikov/wip-release-notes-indents
doc/release-notes: fix indents
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Kefu Chai [Tue, 29 Mar 2016 03:21:23 +0000 (11:21 +0800)]
Merge pull request #8342 from xiexingguo/xxg-wip-doc
doc: fix typo, duplicated content etc. for Jewel release notes
Reviewed-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Tue, 29 Mar 2016 03:19:46 +0000 (11:19 +0800)]
doc/release-notes: fix indents
Signed-off-by: Kefu Chai <kchai@redhat.com>
xie xingguo [Tue, 29 Mar 2016 01:38:23 +0000 (09:38 +0800)]
doc: fix typo, duplicated content etc. for Jewel release notes
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
Casey Bodley [Mon, 28 Mar 2016 19:29:41 +0000 (15:29 -0400)]
Merge pull request #8321 from linuxbox2/jewel-nfs-fixes-2
rgw_file: set owner uid, gid, and Unix mode on new objects
Casey Bodley [Mon, 28 Mar 2016 17:24:35 +0000 (13:24 -0400)]
Merge pull request #8106 from linuxbox2/wip-cmake-ssl
cmake: add FindOpenSSL.cmake
Loic Dachary [Mon, 28 Mar 2016 17:13:02 +0000 (19:13 +0200)]
Merge pull request #8312 from SUSE/wip-submittingpatches
doc: amend Fixes instructions in SubmittingPatches
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Matt Benjamin [Mon, 28 Mar 2016 16:05:38 +0000 (12:05 -0400)]
rgw_file tests: allow override of owner_uid and owner_gid
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
Casey Bodley [Mon, 28 Mar 2016 15:42:05 +0000 (11:42 -0400)]
Merge pull request #8284 from yehudasa/wip-rgw-sync-fixes-5
rgw: fix lockdep false positive
Sage Weil [Mon, 28 Mar 2016 14:48:42 +0000 (10:48 -0400)]
Merge pull request #7820 from yuyuyu101/remove-exper
msg/async: remove experiment feature
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Mon, 28 Mar 2016 12:28:45 +0000 (08:28 -0400)]
Merge pull request #8308 from wido/cloudstack-docs
doc: Updated CloudStack RBD documentation
Sage Weil [Mon, 28 Mar 2016 12:23:58 +0000 (08:23 -0400)]
Merge pull request #8327 from vumrao/wip-vumrao-15288
doc: Remove Ceph Monitors do lots of fsync()
Sage Weil [Mon, 28 Mar 2016 12:23:10 +0000 (08:23 -0400)]
Merge pull request #8328 from scienceluo/master
doc: Fixes headline different font size and type
Sage Weil [Mon, 28 Mar 2016 12:15:59 +0000 (08:15 -0400)]
Merge pull request #8293 from dachary/wip-subman-facts
script: subscription-manager support (part 2)
Reviewed-by: Kefu Chai <kchai@redhat.com>
Vikhyat Umrao [Mon, 28 Mar 2016 07:27:04 +0000 (12:57 +0530)]
doc: Remove Ceph Monitors do lots of fsync()
and change the ligature of "fl" to "f" and "l"
Fixes: #15288
Signed-off-by: Vikhyat Umrao <vumrao@redhat.com>
scienceluo [Mon, 28 Mar 2016 06:10:28 +0000 (14:10 +0800)]
Fixes headline different font size and type
Matt Benjamin [Wed, 23 Mar 2016 21:29:30 +0000 (17:29 -0400)]
rgw_file: set owner uid, gid, and Unix mode on new objects
Unix attributes aren't current materialized, but a future change
will serialize them in a new object attribute.
Also moves create and mkdir into operations on RGWLibFS, which
better encapsulates the behavior.
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
Sage Weil [Sun, 27 Mar 2016 14:02:26 +0000 (10:02 -0400)]
Merge pull request #8299 from liewegas/wip-15230
messages/MOSDOp: clear reqid inc for v6 encoding
Sage Weil [Sun, 27 Mar 2016 14:01:14 +0000 (10:01 -0400)]
Merge pull request #8318 from tchaikov/wip-15240
test/system/*: use dynamically generated pool name
Reviewed-by: Sage Weil <sage@redhat.com>
Kefu Chai [Sun, 27 Mar 2016 13:21:54 +0000 (21:21 +0800)]
test/system/*: use dynamically generated pool name
was using "foo" for the pool name. this works if we are performing
tests in serial. but if we do it in parallel, the tests interfere
with each other.
Fixes: #15240
Signed-off-by: Kefu Chai <kchai@redhat.com>
Sage Weil [Sat, 26 Mar 2016 20:17:14 +0000 (16:17 -0400)]
Merge pull request #7094 from songbaisen/wipdf
mon: show the pool quota info on ceph df detail command
Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
Sage Weil [Sat, 26 Mar 2016 20:16:26 +0000 (16:16 -0400)]
Merge pull request #8275 from xiexingguo/xxg-wip-fixdirtyinfo
osd: fix dirtying info without correctly setting drity_info field
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Sat, 26 Mar 2016 20:16:09 +0000 (16:16 -0400)]
Merge pull request #8230 from majianpeng/clear-omap
osd: fix bugs for omap ops
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Sat, 26 Mar 2016 20:14:02 +0000 (16:14 -0400)]
Merge pull request #8254 from xiexingguo/xxg-wip-osd
osd: fix reference count, rare race condition etc.
Reviewed-by: Kefu Chai <kchai@redhat.com>
Sage Weil [Sat, 26 Mar 2016 20:13:42 +0000 (16:13 -0400)]
Merge pull request #8291 from xiexingguo/xxg-wip-fixhistorymerge
osd: more fixes for incorrectly dirtying info; resend reply for duplicated scrub-reserve req
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Sat, 26 Mar 2016 20:12:29 +0000 (16:12 -0400)]
Merge pull request #8247 from liewegas/wip-split-creates
mon: do not send useless pg_create messages for split pgs
Reviewed-by: Kefu Chai <kchai@redhat.com>
Sage Weil [Sat, 26 Mar 2016 20:11:41 +0000 (16:11 -0400)]
Merge pull request #8208 from liewegas/wip-15027
mon: mark_down_pgs in lockstep with pg_map's osdmap epoch
Reviewed-by: Kefu Chai <kchai@redhat.com>
Loic Dachary [Thu, 24 Mar 2016 10:59:33 +0000 (11:59 +0100)]
script: subscription-manager support (part 2)
Strip the .py suffix so that no pyc / pyo files are generated.
Do not install on CentOS.
http://tracker.ceph.com/issues/14972 Fixes: #14972
Signed-off-by: Loic Dachary <loic@dachary.org>
Sage Weil [Sat, 26 Mar 2016 13:47:51 +0000 (09:47 -0400)]
ceph_test_rados_api_misc: debug LibRadosMiscConnectFailure.ConnectFailure
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Sat, 26 Mar 2016 01:56:01 +0000 (21:56 -0400)]
messages/MOSDOp: clear reqid inc for v6 encoding
For the new v7 encoding, we put the client incarnation in the
reqid so that we can have it at the beginning of the encoding.
However, we do *not* want to do this for the v6 encoding, as that
version of get_reqid() will return reqid if it is not ==
osd_reqid_t().
Fixes: #15230
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Sat, 26 Mar 2016 01:21:36 +0000 (21:21 -0400)]
Merge pull request #8265 from athanatos/wip-journal-default
config_opts: disable filestore throttle soft backoff by default
Sage Weil [Fri, 25 Mar 2016 20:28:42 +0000 (16:28 -0400)]
Merge pull request #8306 from tchaikov/wip-doc-formatting
doc/rados/operations/crush: fix the formatting
Sage Weil [Fri, 25 Mar 2016 20:10:35 +0000 (16:10 -0400)]
Merge pull request #8202 from XinzeChi/wip-objecter-tid
osdc/Objecter: dout log after assign tid
Reviewed-by: Kefu Chai <kchai@redhat.com>
Sage Weil [Fri, 25 Mar 2016 19:49:23 +0000 (15:49 -0400)]
Merge remote-tracking branch 'gh/jewel'
Kefu Chai [Fri, 25 Mar 2016 17:23:41 +0000 (01:23 +0800)]
Merge pull request #8310 from tchaikov/wip-fix-rbdmap-manpage
makefile: fix rbdmap manpage
Reviewed-by: Sage Weil <sage@redhat.com>
Nathan Cutler [Fri, 25 Mar 2016 16:34:47 +0000 (17:34 +0100)]
doc: amend Fixes instructions in SubmittingPatches
Since the "Fixes: #..." line is interpreted by GitHub as referring to a
pull request, yet the intention is for it to refer to the tracker issue,
change our instructions to use the full tracker issue URL.
Now that github pull request numbers are in the 8000s, there are cases when
a PR is wrongly closed by a "Fixes: #..." line in a commit message. See
https://github.com/ceph/ceph/pull/8286#event-
603120191
for one such case.
Signed-off-by: Nathan Cutler <ncutler@suse.com>
Kefu Chai [Fri, 25 Mar 2016 15:46:25 +0000 (23:46 +0800)]
cmake: conditionally install man pages
this matches its counterpart in automake
* install fuse related man pages only if HAVE_LIBFUSE
* install rbd related man pages only if WITH_RBD
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Fri, 25 Mar 2016 15:38:48 +0000 (23:38 +0800)]
autotools: add rbdmap to dist_man_MANS
this fixes the rpm/deb build failure
was introduced by
20c8650
Signed-off-by: Kefu Chai <kchai@redhat.com>
Sage Weil [Fri, 25 Mar 2016 15:22:43 +0000 (11:22 -0400)]
Merge pull request #8038 from badone/wip-crushtool-crash
crushtool: Don't crash when called on a file that isn't a crushmap
Reviewed-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Fri, 25 Mar 2016 15:21:31 +0000 (23:21 +0800)]
Merge pull request #8309 from tchaikov/wip-15240
test/system/rados_list_parallel: print oid if rados_write fails
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 25 Mar 2016 15:10:06 +0000 (11:10 -0400)]
xxHash: fix submodule commit
This was inadvertantly rewinded in
b9a14312edd6a4edb0f4783ab08ad97e0e9ba03f
Signed-off-by: Sage Weil <sage@redhat.com>
xie xingguo [Fri, 25 Mar 2016 03:25:53 +0000 (11:25 +0800)]
osd/pg: publish stats to osd if pg is currently marked as down
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
xie xingguo [Fri, 25 Mar 2016 03:04:42 +0000 (11:04 +0800)]
osd/pg: publish stats to osd if we recovered from degraded
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
xie xingguo [Fri, 25 Mar 2016 02:56:46 +0000 (10:56 +0800)]
osd/pg: avoid publishing pg_stat twice in a short interval
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
xie xingguo [Fri, 25 Mar 2016 02:09:29 +0000 (10:09 +0800)]
osd/pg: fold sanity check into one single "if" qualification
Just as "boost::statechart::result
PG::RecoveryState::WaitRemoteBackfillReserved::react(const RemoteBackfillReserved &evt)"
does.
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
xie xingguo [Thu, 24 Mar 2016 12:01:16 +0000 (20:01 +0800)]
osd/pg: drop unnecessary update_heartbeat_peers()
The proc_replica_info() method will do the same job in a
smarter way, so the succeeding call to update_heartbeat_peers()
is unnecessary and cost expensive.
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
Sage Weil [Fri, 25 Mar 2016 13:55:30 +0000 (09:55 -0400)]
Merge pull request #8211 from liewegas/wip-jewel
doc: draft notes for jewel
Sage Weil [Fri, 25 Mar 2016 13:53:56 +0000 (09:53 -0400)]
Merge pull request #8044 from dzafman/wip-8885
osd: fix dump_ops_in_flight races
Reviewed-by: Samuel Just <sjust@redhat.com>
Sage Weil [Fri, 25 Mar 2016 13:52:35 +0000 (09:52 -0400)]
Merge pull request #8156 from liewegas/wip-pg-query
osd/PG: indicate in pg query output whether ignore_history_les would help
Revewed-by: Samuel Just <sjust@redhat.com>
Sage Weil [Fri, 25 Mar 2016 13:52:21 +0000 (09:52 -0400)]
Merge pull request #8177 from majianpeng/signal-handle
global/signal_handler: print thread name in signal handler
Reviewed-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Fri, 25 Mar 2016 13:43:24 +0000 (21:43 +0800)]
test/system/rados_list_parallel: print oid if rados_write fails
Signed-off-by: Kefu Chai <kchai@redhat.com>
Sage Weil [Fri, 25 Mar 2016 13:41:12 +0000 (09:41 -0400)]
doc/release-notes: rgw typo
Signed-off-by: Sage Weil <sage@redhat.com>
Orit Wasserman [Fri, 25 Mar 2016 12:50:44 +0000 (13:50 +0100)]
Merge pull request #8294 from theanalyst/rgw/bucket-quota-check
rgw:Use count fn in RGWUserBuckets for quota check
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
Wido den Hollander [Fri, 25 Mar 2016 11:06:24 +0000 (12:06 +0100)]
doc: Updated CloudStack RBD documentation
Signed-off-by: Wido den Hollander <wido@42on.com>
Marcus Watts [Fri, 25 Mar 2016 10:11:34 +0000 (06:11 -0400)]
Update SSL support a bit.
Use cmake's FindOpenSSL. Actually use the library definitions that
come out of it. Also use the include path. If SSL is disabled,
then build without any of this. The result will be a version
of civetweb that includes openssl support using dlopen() - ie,
what we used to do. This is probably a bit silly, and I hope
nobody actually expects to use it that way, but it's mostly harmless.
Signed-off-by: Marcus Watts <mwatts@redhat.com>
Matt Benjamin [Mon, 14 Mar 2016 21:37:51 +0000 (17:37 -0400)]
cmake: add FindOpenSSL.cmake
Use find_package to enforce the dependency up front (we should be
using this pattern throughout top-level CMakeLists.txt).
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
Kefu Chai [Fri, 25 Mar 2016 07:53:11 +0000 (15:53 +0800)]
doc/rados/operations/crush: fix the formatting
unlike in LaTeX, we should use ``foo`` instead of ``bar'' in the
sphinx markdown for the double quote.
Signed-off-by: Kefu Chai <kchai@redhat.com>
Greg Farnum [Fri, 25 Mar 2016 00:55:56 +0000 (17:55 -0700)]
Merge remote-tracking branch 'origin/wip-15065'
Support new standby_for_fscid option, letting us assign daemons to FS clusters.
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Greg Farnum [Fri, 25 Mar 2016 00:50:43 +0000 (17:50 -0700)]
Merge branch 'wip-mfsmap-features' of git://github.com/jcsp/ceph
Clean up some code in the new multi-fs handling. Make its output
more precise and add some debug/repair config options.
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Conflicts:
src/mds/FSMap.cc
Signed-off-by: Greg Farnum <gfarnum@redhat.com>
Gregory Farnum [Fri, 25 Mar 2016 00:49:22 +0000 (17:49 -0700)]
Merge pull request #7952 from ukernel/wip-14360
mds: allow client to request caps when opening file
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Gregory Farnum [Fri, 25 Mar 2016 00:44:53 +0000 (17:44 -0700)]
Merge pull request #8180 from ukernel/jewel-15167
Be more careful about directory fragmentation and scrubbing
Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Gregory Farnum [Fri, 25 Mar 2016 00:41:38 +0000 (17:41 -0700)]
Merge pull request #8115 from ukernel/jewel-cephfs-data-scan-misc
Minor fixes around data scan in some scenarios
Reviewed-by: John Spray <john.spray@redhat.com>
Yehuda Sadeh [Thu, 24 Mar 2016 22:07:27 +0000 (15:07 -0700)]
rgw: fetch_remote_obj() fix handling of ERR_NOT_MODIFIED
got broken when disabled opstate
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
Yehuda Sadeh [Thu, 24 Mar 2016 22:06:44 +0000 (15:06 -0700)]
rgw: parse mtime only when header exists and not error
No need to try parsing mtime otherwise.
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
Yehuda Sadeh [Wed, 23 Mar 2016 22:24:17 +0000 (15:24 -0700)]
rgw: fix lockdep false positive
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
Josh Durgin [Thu, 24 Mar 2016 16:28:16 +0000 (09:28 -0700)]
Merge pull request #8297 from dillaman/wip-cls-rbd-mirror-image-list
cls_rbd: mirror_image_list should return global image id
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Orit Wasserman [Thu, 24 Mar 2016 16:26:25 +0000 (17:26 +0100)]
Merge pull request #8253 from wido/issue-15119
rgw: Do not send a Content-Type on a '304 Not Modified' response
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
Josh Durgin [Thu, 24 Mar 2016 16:19:48 +0000 (09:19 -0700)]
Merge pull request #8224 from SUSE/wip-15212
rbdmap: add manpage
Reviewed-by: Boris Ranto <branto@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Jason Dillaman [Thu, 24 Mar 2016 12:46:54 +0000 (08:46 -0400)]
cls_rbd: mirror_image_list should return global image id
The global image id is needed to crosslink images when an image is
replicated between multiple clusters.
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Abhishek Lekshmanan [Thu, 24 Mar 2016 11:01:51 +0000 (12:01 +0100)]
rgw:Use count fn in RGWUserBuckets for quota check
We already have a count function from RGWUserBuckets class which gives
the total size of the map, use that instead of getting the map and doing
a count.
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
Jenkins Build Slave User [Thu, 24 Mar 2016 10:53:48 +0000 (10:53 +0000)]
10.1.0
Alfredo Deza [Thu, 24 Mar 2016 10:45:16 +0000 (06:45 -0400)]
Merge pull request #8285 from dmick/jewel
debian/control: try installing virtualenv first, if it exists
Reviewed-by: Alfredo Deza <adeza@redhat.com>
Jianpeng Ma [Mon, 21 Mar 2016 12:19:52 +0000 (20:19 +0800)]
os/bluestore/BlueStore.cc: when do omapclear, it should clear omap_head.
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
Jianpeng Ma [Thu, 24 Mar 2016 09:58:31 +0000 (17:58 +0800)]
osd/ReplicatedPG: when do omapclear, it clear FLAG_OMAP at the same time.
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
Jianpeng Ma [Thu, 24 Mar 2016 09:55:00 +0000 (17:55 +0800)]
osd/ReplicatedPG: When do omapclear, it should check object whether is omap.
Though is_omap don't make sure object has omap header or k/v now, if
object isn't has FLAG_OMAP, it must don't have omap header or k/v.
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
Jianpeng Ma [Thu, 24 Mar 2016 09:49:39 +0000 (17:49 +0800)]
osd/ReplicatedPG: For omap read ops, it should check object wether has omap
For set omap heaader or k/v, it set FLAG_OMAP. When remove header
or k/v, it don't remove FLAG_OMAP because it don't know object whether
have omap header or other k/vs.
Though object has FLAG_OMAP dont mean now it has omap header or k/v, it
better check FLAG_OMAP than pool whether support omap operations for omap reads.
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>