Sage Weil
55487eeb03
Merge pull request #6660 from chengyli/master
...
mon: fix ceph df pool available calculation for 0-weighted OSDs
Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-11-25 20:13:40 -05:00
Sage Weil
88fe166cfa
Merge pull request #6473 from H3C/wip-osd-bugfix1
...
auth: fail if rotating key is missing (do not spam log)
Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-11-25 17:46:01 -05:00
Sage Weil
d9705f49ef
Merge pull request #6278 from XinzeChi/wip-failinfo-mon
...
osd: cancel failure reports if we fail to rebind network
Reviewed-by: Sage Weil <sage@redhat.com>
2015-11-25 17:44:56 -05:00
Sage Weil
058733bb4b
Merge pull request #6675 from rohanmars/wip-aix-librados-port
...
aix gcc librados port
Reviewed-by: Sage Weil <sage@redhat.com>
2015-11-25 17:43:44 -05:00
Rohan Mars
b96c7e6383
aix shared library build
...
Signed-off-by: Rohan Mars <code@rohanmars.com>
2015-11-25 18:30:31 -05:00
Greg Farnum
5090744560
Merge branch 'wip-13800' of git://github.com/ukernel/ceph
...
client: fix deadlock related to async pagecache invalidation
Conflicts:
src/client/Client.cc
Fixed a conflict with the earlier page cache invalidate
changes in 73beb7f937
.
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2015-11-25 14:21:38 -08:00
Gregory Farnum
37dd1f00e2
Merge pull request #6454 from H3C/wip-mds
...
mds: repair the command option "--hot-standby"
Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2015-11-25 17:10:58 -05:00
Gregory Farnum
3fed378f8b
Merge pull request #6269 from jcsp/wip-client-mark-down
...
client: close mds sessions in shutdown()
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2015-11-25 17:07:56 -05:00
Gregory Farnum
7d1291413b
Merge pull request #6380 from ukernel/wip-client-keep-cache
...
client: don't invalidate page cache when inode is no longer used
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2015-11-25 17:02:06 -05:00
Gregory Farnum
e3e0846462
Merge pull request #6253 from jcsp/wip-client-availability
...
client: a better check for MDS availability
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2015-11-25 17:00:04 -05:00
Sage Weil
3680dc32ca
mon/OSDMonitor: block 'ceph osd pg-temp ...' if update is pending
...
The OSD expects it's pg_temp update requests to succeed. If it
races with an ill-timed admin request, it can get stuck in
WaitActingChange indefinitely.
This is only a real problem now that the OSD/mon interaction has
been updated with wip-bigbang; previously we would retry (although
it would take a while). Backporting is optional.
Signed-off-by: Sage Weil <sage@redhat.com>
2015-11-25 16:40:13 -05:00
Yehuda Sadeh
7ce223ec0f
Merge pull request #6051 from clever215/master
...
rgw: add an inspection to the field of type when assigning user caps
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2015-11-25 09:37:40 -08:00
clever215
13a12a5364
rgw: add an inspection to the field of type when assigning user caps
...
Bug #13096
This modification adds the check to the field of type of a user's capality while previous versions set it any value. i.e. we limit the option of types to the 9 certain values, which are "users|buckets|metadata|usage|zone|bilog|mdlog|datalog|ops These 9 choosens are found in ceph documents and in source codes.
Signed-off-by: Kongming Wu <wu.kongming@h3c.com>
2015-11-25 11:33:09 -05:00
Josh Durgin
12d3d64496
Merge pull request #6700 from dillaman/wip-librbd-32bit-support
...
librbd: simplify IO method signatures for 32bit environments
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-11-25 08:24:37 -08:00
Jason Dillaman
3369a835a4
librbd: simplify IO method signatures for 32bit environments
...
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-11-25 09:23:54 -05:00
Ning Yao
ba3c64ca70
Fix mon routed_request_tids leak
...
Signed-off-by: Ning Yao <zay11022@gmail.com>
2015-11-25 22:13:18 +08:00
Yan, Zheng
e242d84fa1
mds: remove MDCache::cap_import_paths
...
it's no longer used.
Signed-off-by: Yan, Zheng <zyan@redhat.com>
2015-11-25 22:12:49 +08:00
Loic Dachary
15b2aca3cd
tests: ceph-helpers assert success getting backfills
...
Signed-off-by: Loic Dachary <loic@dachary.org>
2015-11-25 12:23:45 +01:00
Josh Durgin
97affaa21c
Merge pull request #6625 from dillaman/wip-12698
...
librbd: integrate journaling for maintenance operations
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-11-24 19:01:14 -08:00
Josh Durgin
ec7f4610cd
Merge pull request #6687 from dillaman/wip-journal-replay-fixes
...
journal: support replaying beyond skipped splay objects
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-11-24 16:37:52 -08:00
Loic Dachary
5d15b92085
Merge pull request #6685 from dachary/wip-erasure-code-benchmark
...
qa: erasure-code benchmark plugin selection
Reviewed-by: Andreas Peters <andreas.joachim.peters@cern.ch>
2015-11-24 21:25:42 +01:00
Yehuda Sadeh
53eda867bc
Merge pull request #6292 from dx9/wip-12406-res_nquery
...
rgw/rgw_resolve: fallback to res_query when res_nquery not implemented
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2015-11-24 12:09:10 -08:00
Sage Weil
692b74071c
Merge pull request #6236 from guangyy/err-msg
...
osd: use pg id (without shard) when referring the PG
Reviewed-by: Sage Weil <sage@redhat.com>
2015-11-24 15:00:07 -05:00
Sage Weil
ff75ae9a47
Merge pull request #6610 from ktdreyer/wip-build-doc-lxml
...
admin/build-doc: add lxml dependencies on debian
Reviewed-by: Sage Weil <sage@redhat.com>
2015-11-24 12:49:08 -05:00
John Spray
922fea7ed6
client: s/close_sessions/_close_sessions/
...
Signed-off-by: John Spray <john.spray@redhat.com>
2015-11-24 17:48:14 +00:00
Gregory Farnum
0ab6027641
Merge pull request #6323 from dingshang/wip-cephfs-dingshang
...
pybind/cephfs: add symlink and its unit test
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2015-11-24 10:16:47 -05:00
John Spray
07a748310d
client: close mds sessions in shutdown()
...
Usually this happens in unmount(), but when we
have instantiated Client without mounting (to
send MDS commands), we need to handle closing
any open sessions in shutdown as well.
This is the correct replacement for the mark_down()
call that was removed from handle_command_reply
in the last commit.
Signed-off-by: John Spray <john.spray@redhat.com>
2015-11-24 15:12:12 +00:00
Sage Weil
1e9aeb5728
Merge tag 'v10.0.0'
...
v10.0.0
2015-11-24 08:41:04 -05:00
Yan, Zheng
b498fdf135
Merge pull request #6684 from jcsp/wip-fix-scrub
...
mds: fix scrub_path
2015-11-24 10:56:30 +08:00
Jason Dillaman
d1c9bf63ea
journal: support replay passed skipped splay objects
...
It's possible for a splay object within a set to be skipped
if the set is closed due to a full object within the set.
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-11-23 17:46:55 -05:00
Jason Dillaman
56100efb96
tests: verify that journal player can handle skipped journal objects
...
It's possible for a journal object to not exist if another journal object
within the same object set filled up before records were written.
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-11-23 17:44:42 -05:00
Gregory Farnum
f0d17d88b7
Merge pull request #6605 from yuyuyu101/wip-13797
...
ceph_test_msgr: Use send_message instead of keepalive to wakeup connection
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2015-11-23 17:33:20 -05:00
Loic Dachary
16b6f7ac05
Merge pull request #6495 from objoo/master
...
Mailmap updates for infernalis.
Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-11-23 23:31:06 +01:00
Yann Dupont
1509ada52c
mailmap: Jenkins affiliation
...
Signed-off-by: Yann Dupont <yann@objoo.org>
2015-11-23 23:13:48 +01:00
Yann Dupont
d92f611138
mailmap: Burkhard Linke affiliation
...
Signed-off-by: Yann Dupont <yann@objoo.org>
2015-11-23 23:13:48 +01:00
Yann Dupont
27f81d4f17
mailmap: Chen Dihao affiliation
...
Signed-off-by: Yann Dupont <yann@objoo.org>
2015-11-23 22:33:45 +01:00
Yann Dupont
8dc6748769
mailmap: Wei Qian affiliation
...
Signed-off-by: Yann Dupont <yann@objoo.org>
2015-11-23 22:33:45 +01:00
Loic Dachary
39032ba9c6
qa: erasure-code-benchmark technique and plugin selection
...
Update the PLUGINS variable that was no longer used. Add the TECHNIQUES
variable to control which techniques are compared.
Signed-off-by: Loic Dachary <loic@dachary.org>
2015-11-23 21:25:27 +01:00
Loic Dachary
a6433cc490
qa: erasure-code has --erasure-code-dir
...
It is used instead of the obsoleted --parameter directory= to specify
the location of the erasure code directory plugins.
Signed-off-by: Loic Dachary <loic@dachary.org>
2015-11-23 20:21:42 +01:00
Rohan Mars
8789eb9d49
add aix compile warning
...
Signed-off-by: Rohan Mars <code@rohanmars.com>
2015-11-23 13:09:24 -05:00
Rohan Mars
5b1f962182
initialized backtrace variables
...
Signed-off-by: Rohan Mars <code@rohanmars.com>
2015-11-23 12:47:02 -05:00
John Spray
f86eb3f750
mds: fix scrub_path
...
This was tripping up over calling
validate_disk_state with no ScrubHeader.
Signed-off-by: John Spray <john.spray@redhat.com>
2015-11-23 17:39:14 +00:00
Loic Dachary
75bd1a51d1
Merge pull request #6679 from suckowbiz/patch-1
...
Fixed typos
Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-11-23 17:33:52 +01:00
Sage Weil
4025f75466
doc/release-notes: fix typo
...
Signed-off-by: Sage Weil <sage@redhat.com>
2015-11-23 11:02:58 -05:00
Sage Weil
efbcd120da
doc/release-notes: final v10.0.0 notes
...
Signed-off-by: Sage Weil <sage@redhat.com>
2015-11-23 11:00:29 -05:00
Xinze Chi
48a71a737f
mon: do not ignore a failure report cancellation form osd
...
do not ignore a failure report cancellation form osd even if it is
down.
Signed-off-by: Xinze Chi <xinze@xsky.com>
2015-11-23 23:50:21 +08:00
Xinze Chi
c0c5a6e7d0
mon: fix osd failure info in mon
...
when the network adapter of node A run into error, osd in this node
would tell mon other osd's heartbeat is timeout also. So when rebind
fail after retry 3 times, the osd should cancel in-flight failure report
send to mon before.
Signed-off-by: Xinze Chi <xinze@xsky.com>
2015-11-23 23:50:21 +08:00
suckowbiz
5972a44106
doc: fix message typos in systemd
...
Signed-off-by: Tobias Suckow <tobias@suckow.biz>
2015-11-23 16:50:07 +01:00
Sage Weil
d4694f6a8e
Merge branch 'master' of github.com:ceph/ceph
2015-11-23 09:01:30 -05:00
Sage Weil
8631b72590
Merge pull request #6666 from dachary/wip-release-notes
...
release-notes: draft v10.0.0 release notes
2015-11-23 09:01:48 -05:00