]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
10 years agoosd: Add Transaction::TransactionData for fast encode/decode
Dong Yuan [Tue, 4 Nov 2014 09:10:05 +0000 (09:10 +0000)]
osd: Add Transaction::TransactionData for fast encode/decode

TransactionData wrap the following fields:
      __le64 ops;
      __le32 largest_data_len;
      __le32 largest_data_off;
      __le32 largest_data_off_in_tbl;
      __le32 pad; //make TransactionData multiple of uint64_t

This struct can encode/decode just by a single memcpy instead of many
encode/decode operations.

Change-Id: I56df78def43bd2b80b77be0825756e133434a6e6
Signed-off-by: Dong Yuan <yuandong1222@gmail.com>
10 years agoosd: remove unused Transaction fields
Dong Yuan [Mon, 8 Dec 2014 14:40:39 +0000 (14:40 +0000)]
osd: remove unused Transaction fields

We don't need sobject and pool_override anymore since we don't need to
support anything older than dumpling.

Change-Id: I22c01d4b5c6bf99765bf6bc13aecadc997d6750c
Signed-off-by: Dong Yuan <yuandong1222@gmail.com>
10 years agoMerge pull request #3272 from trociny/tell-mon-version
Loic Dachary [Tue, 6 Jan 2015 18:35:36 +0000 (19:35 +0100)]
Merge pull request #3272 from trociny/tell-mon-version

cli: make ceph tell mon.* version work

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #3196 from tchaikov/shadow-cct
Loic Dachary [Tue, 6 Jan 2015 18:34:20 +0000 (19:34 +0100)]
Merge pull request #3196 from tchaikov/shadow-cct

client, librados, osdc: do not shadow Dispatcher::cct

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #3298 from majianpeng/fix5
Loic Dachary [Tue, 6 Jan 2015 18:32:27 +0000 (19:32 +0100)]
Merge pull request #3298 from majianpeng/fix5

TestLFNIndex.cc: For root, dont do permission operations.

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #3283 from dachary/wip-make-debs
Loic Dachary [Tue, 6 Jan 2015 18:07:04 +0000 (19:07 +0100)]
Merge pull request #3283 from dachary/wip-make-debs

debian: create a repository from sources

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #3301 from ktdreyer/rm-tiobench
Sage Weil [Tue, 6 Jan 2015 16:26:04 +0000 (08:26 -0800)]
Merge pull request #3301 from ktdreyer/rm-tiobench

#10152: qa: drop tiobench suite

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #3300 from ceph/wip-10412
Sage Weil [Tue, 6 Jan 2015 16:20:19 +0000 (08:20 -0800)]
Merge pull request #3300 from ceph/wip-10412

client: fix use-after-free bug in unmount()

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoqa: drop tiobench suite 3301/head
Ken Dreyer [Tue, 6 Jan 2015 15:16:20 +0000 (08:16 -0700)]
qa: drop tiobench suite

The tiobench software has been abandoned upstream for years. Fedora and
Debian are no longer shipping the tiobench package, so we've had to
carry the package ourselves in the Ceph project, and we're trying to
slim down our dependencies where it makes sense to do so.

Nuke the tiobench suite.

http://tracker.ceph.com/issues/10152 Refs: #10152

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
10 years agoMerge pull request #3276 from ceph/wip-repop
Sage Weil [Tue, 6 Jan 2015 15:11:53 +0000 (07:11 -0800)]
Merge pull request #3276 from ceph/wip-repop

Add MOSDRepOp and MOSDRepOpReply

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
10 years agoMerge pull request #3299 from wonzhq/compile-warn
Sage Weil [Tue, 6 Jan 2015 14:50:49 +0000 (06:50 -0800)]
Merge pull request #3299 from wonzhq/compile-warn

cleanup: fix a compile warning

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoclient: fix use-after-free bug in unmount() 3300/head
Yan, Zheng [Tue, 6 Jan 2015 12:17:28 +0000 (20:17 +0800)]
client: fix use-after-free bug in unmount()

If there is error, _release_fh() already outputs error message.
No need to print extra error message

Fixes: #10412
Signed-off-by: Yan, Zheng <zyan@redhat.com>
10 years agocleanup: fix a compile warning 3299/head
Zhiqiang Wang [Tue, 6 Jan 2015 08:36:03 +0000 (16:36 +0800)]
cleanup: fix a compile warning

warning: 'pi' may be used uninitialized in this function
[-Wmaybe-uninitialized]

Signed-off-by: Zhiqiang Wang <zhiqiang.wang@intel.com>
10 years agoTestLFNIndex.cc: For root, dont do permission operations. 3298/head
Jianpeng Ma [Tue, 6 Jan 2015 08:23:40 +0000 (16:23 +0800)]
TestLFNIndex.cc: For root, dont do permission operations.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
10 years agoMerge pull request #3293 from ktdreyer/help-missing-keyutils-libs-devel
Sage Weil [Tue, 6 Jan 2015 02:24:11 +0000 (18:24 -0800)]
Merge pull request #3293 from ktdreyer/help-missing-keyutils-libs-devel

configure: show package name when libkeyutils is missing

10 years agoMerge pull request #3294 from ceph/wip-fix-copyfrom
Sage Weil [Tue, 6 Jan 2015 00:54:20 +0000 (16:54 -0800)]
Merge pull request #3294 from ceph/wip-fix-copyfrom

osd: fix copyfrom

Reviewed-by: Samuel Just <sjust@redhat.com>
10 years agoMerge pull request #3226 from ceph/wip-10319-wusui
Josh Durgin [Mon, 5 Jan 2015 23:39:22 +0000 (15:39 -0800)]
Merge pull request #3226 from ceph/wip-10319-wusui

If trusty, use older version of qemu

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agoosd: fix object_copy_data_t compat encoding 3294/head
Sage Weil [Tue, 30 Dec 2014 01:32:54 +0000 (17:32 -0800)]
osd: fix object_copy_data_t compat encoding

If the omap_data map is empty, we want an empty bufferlist.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #3189 from ceph/wip-10329
Josh Durgin [Mon, 5 Jan 2015 21:28:19 +0000 (13:28 -0800)]
Merge pull request #3189 from ceph/wip-10329

Wip 10329

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agoosd/PG: print last_update_applied if != last_update 3276/head
Sage Weil [Tue, 30 Dec 2014 17:29:16 +0000 (09:29 -0800)]
osd/PG: print last_update_applied if != last_update

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoAdd MOSDRepOp and MOSDRepOpReply
Xiaoxi Chen [Fri, 21 Nov 2014 00:34:54 +0000 (08:34 +0800)]
Add MOSDRepOp and MOSDRepOpReply

Add the two new message type and change the corresponding code flow as well.

Basically the idea to have MOSDRepOp is to seperate subop(read/write)
out of other subop(pull/push,etc), so that we can cleanup some unused fields in
the message type, then save some encoding/decoding overhead.

The backward compatibility is also remian, if talking with old version OSD who
doesn't support osd_client_subop/subopreply, will fall back to osd_subop/subopreply.

Sage: rename MOSDClientSubOp -> MOSDRepOp

Signed-off-by: Xiaoxi Chen <xiaoxi.chen@intel.com>
Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #3206 from ceph/wip-librados-init
Josh Durgin [Mon, 5 Jan 2015 20:34:17 +0000 (12:34 -0800)]
Merge pull request #3206 from ceph/wip-librados-init

librados: init last_objver

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agoconfigure: show pkg names when libkeyutils is missing 3293/head
Ken Dreyer [Mon, 5 Jan 2015 19:11:00 +0000 (12:11 -0700)]
configure: show pkg names when libkeyutils is missing

Prior to this commit, when ./configure can't find libkeyutils, it would
bail out with a terse error message.

Some of the other library checks helpfully print the DEB and RPM package
names in parentheses. Add the DEB and RPM package names to the
libkeyutils check.

Reported-by: Pankaj Garg <Pankaj.Garg@caviumnetworks.com>
Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
10 years agoMerge remote-tracking branch 'gh/next'
Sage Weil [Mon, 5 Jan 2015 19:16:57 +0000 (11:16 -0800)]
Merge remote-tracking branch 'gh/next'

10 years agoMerge pull request #3247 from ceph/wip-10422
Sage Weil [Mon, 5 Jan 2015 19:16:49 +0000 (11:16 -0800)]
Merge pull request #3247 from ceph/wip-10422

mon: provide encoded canonical full OSDMap from primary

Reviewed-by: Joao Eduardo Luis <joao@redhat.com>
10 years agoqa: add test_tell, which currently is used only for testing 'ceph tell mon version'. 3272/head
Mykola Golub [Tue, 30 Dec 2014 10:03:32 +0000 (12:03 +0200)]
qa: add test_tell, which currently is used only for testing 'ceph tell mon version'.

The test requires at least two monitors run.

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
10 years agoMerge pull request #3291 from majianpeng/fix2
Loic Dachary [Mon, 5 Jan 2015 13:28:50 +0000 (14:28 +0100)]
Merge pull request #3291 from majianpeng/fix2

test/bufferlist: Remove chmod operation.

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agotest/bufferlist: For root, don't do permission operation for read_file 3291/head
Jianpeng Ma [Mon, 5 Jan 2015 12:51:21 +0000 (20:51 +0800)]
test/bufferlist: For root, don't do permission operation for read_file
case.

For root user, it meet those error:
    test/bufferlist.cc:1880: Failure
    Value of: bl.read_file("testfile", &error)
      Actual: 0
    Expected: -13
    test/bufferlist.cc:1884: Failure
    Value of: bl.length()
      Actual: 8
    Expected: (unsigned)4
    Which is: 4
    test/bufferlist.cc:1886: Failure
    Value of: actual
      Actual: "ABC
    ABC
    "
    Expected: "ABC\n"
    Which is: "ABC

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
10 years agoqa: refactor 'ceph -w' magic in test_mon_misc by introducing helper
Mykola Golub [Tue, 30 Dec 2014 09:59:31 +0000 (11:59 +0200)]
qa: refactor 'ceph -w' magic in test_mon_misc by introducing helper
functions ceph_watch_start and ceph_watch_wait so they can be reused
in other tests.

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
10 years agomon: make ceph tell mon.* version work
Mykola Golub [Mon, 29 Dec 2014 08:05:28 +0000 (10:05 +0200)]
mon: make ceph tell mon.* version work

Fixes: #6767
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
10 years agoMerge pull request #3261 from tchaikov/async-msgr
Haomai Wang [Mon, 5 Jan 2015 02:14:40 +0000 (10:14 +0800)]
Merge pull request #3261 from tchaikov/async-msgr

AsyncMessenger: a trivial refactory and a fix

Reviewed-by: Haomai Wang <haomaiwang@gmail.com>
10 years agoMerge pull request #3286 from ceph/wip-10351
Sage Weil [Sat, 3 Jan 2015 18:28:21 +0000 (10:28 -0800)]
Merge pull request #3286 from ceph/wip-10351

mount.ceph: avoid spurious error message

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agomount.ceph: avoid spurious error message 3286/head
Yan, Zheng [Sat, 3 Jan 2015 07:29:29 +0000 (15:29 +0800)]
mount.ceph: avoid spurious error message

/etc/mtab in most modern distributions is a symbol link to
/proc/self/mounts.

Fixes: #10351
Signed-off-by: Yan, Zheng <zyan@redhat.com>
10 years agoMerge pull request #3284 from ktdreyer/doc-rados-preflight-os
Loic Dachary [Fri, 2 Jan 2015 17:54:47 +0000 (18:54 +0100)]
Merge pull request #3284 from ktdreyer/doc-rados-preflight-os

doc: rm reference to old Ubuntu release

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agodoc: rm reference to old Ubuntu release 3284/head
Ken Dreyer [Fri, 2 Jan 2015 17:32:26 +0000 (10:32 -0700)]
doc: rm reference to old Ubuntu release

Remove the reference to "Ubuntu 12.10" since this is EOL.

Clarify that we only recommend Ubuntu LTS releases.

(Since this information has a tendancy to become stale, perhaps this
whole paragraph should be removed here and we should simply point at the
main OS Recommendations page.)

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
10 years agodebian: create a repository from sources 3283/head
Loic Dachary [Thu, 1 Jan 2015 19:52:18 +0000 (20:52 +0100)]
debian: create a repository from sources

Create a debian repository suitable for inclusion in
/etc/apt/sources.list, for the current distribution and using the git
clone from the current working directory.

It is meant to quickly provide teuthology with the packages to run a
job.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #3223 from objoo/master
Loic Dachary [Thu, 1 Jan 2015 21:52:24 +0000 (22:52 +0100)]
Merge pull request #3223 from objoo/master

mailmap updates

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoAsyncMessender: use IOV_MAX instead of IOV_LEN 3261/head
Kefu Chai [Sat, 27 Dec 2014 07:04:00 +0000 (15:04 +0800)]
AsyncMessender: use IOV_MAX instead of IOV_LEN

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
10 years agoAsyncMessenger: s/sended/sent/
Kefu Chai [Sat, 27 Dec 2014 06:53:32 +0000 (14:53 +0800)]
AsyncMessenger: s/sended/sent/

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
10 years agoAsyncMessenger: should retry in case of EINTR
Kefu Chai [Sat, 27 Dec 2014 05:44:24 +0000 (13:44 +0800)]
AsyncMessenger: should retry in case of EINTR

* if EINTR is returned, do_send() should return 0 or `continue`.
* reword the comment a little bit

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
10 years agomsg: fix factory error message
Sage Weil [Tue, 30 Dec 2014 22:08:49 +0000 (14:08 -0800)]
msg: fix factory error message

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agounittest_msgr: enable experiemntal async msgr
Sage Weil [Tue, 30 Dec 2014 22:08:38 +0000 (14:08 -0800)]
unittest_msgr: enable experiemntal async msgr

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #3219 from yuyuyu101/wip-10383
Sage Weil [Tue, 30 Dec 2014 18:46:58 +0000 (10:46 -0800)]
Merge pull request #3219 from yuyuyu101/wip-10383

Wip 10383: Fix unittest_msgr with AsyncMessenger bug

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #3279 from ceph/wip-mon-janitorial-list
Sage Weil [Tue, 30 Dec 2014 18:44:17 +0000 (10:44 -0800)]
Merge pull request #3279 from ceph/wip-mon-janitorial-list

src/doc: add monitor janitorial list

10 years agoMerge pull request #3278 from mslovy/wip-y04
Haomai Wang [Tue, 30 Dec 2014 12:30:34 +0000 (20:30 +0800)]
Merge pull request #3278 from mslovy/wip-y04

KeyValueStore:: do_transactions: clean up code which is never used

Reviewed-by: Haomai Wang <haomaiwang@gmail.com>
10 years agoKeyValueStore:: do_transactions: clean up code which is never used 3278/head
Ning Yao [Tue, 30 Dec 2014 10:53:21 +0000 (10:53 +0000)]
KeyValueStore:: do_transactions: clean up code which is never used
clean up ops and bytes which is never used in do_transactions()

Signed-off-by: Ning Yao <zay11022@gmail.com>
10 years agosrc/doc: add monitor janitorial list 3279/head
Joao Eduardo Luis [Tue, 30 Dec 2014 10:08:45 +0000 (10:08 +0000)]
src/doc: add monitor janitorial list

Signed-off-by: Joao Eduardo Luis <joao@redhat.com>
10 years agoMerge pull request #3274 from ceph/wip-10341
Sage Weil [Tue, 30 Dec 2014 00:28:57 +0000 (16:28 -0800)]
Merge pull request #3274 from ceph/wip-10341

tools: ceph-monstore-tool: refactor cli parsing

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoclient: fix quota signed/unsigned warning
Sage Weil [Mon, 29 Dec 2014 23:47:28 +0000 (15:47 -0800)]
client: fix quota signed/unsigned warning

client/Client.cc: In member function 'bool Client::is_quota_bytes_exceeded(Inode*, uint64_t)':
client/Client.cc:10393:66: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
     if (quota->max_bytes && (rstat->rbytes + new_bytes) > quota->max_bytes)

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #3275 from liewegas/wip-experimental
Sage Weil [Mon, 29 Dec 2014 22:22:17 +0000 (14:22 -0800)]
Merge pull request #3275 from liewegas/wip-experimental

mark some features experimental and warn accordingly

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agocommon: log which experimental features are enabled. 3275/head
Sage Weil [Mon, 29 Dec 2014 20:11:18 +0000 (12:11 -0800)]
common: log which experimental features are enabled.

This will appear in the logs regardless of whether or not the features
get used/enabled via other config options.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoms: mark async messenger experimental
Sage Weil [Mon, 29 Dec 2014 19:37:59 +0000 (11:37 -0800)]
ms: mark async messenger experimental

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoos: rename keyvaluestore-dev -> keyvaluestore; mark experimental
Sage Weil [Mon, 29 Dec 2014 19:36:36 +0000 (11:36 -0800)]
os: rename keyvaluestore-dev -> keyvaluestore; mark experimental

Use a clean name for keyvaluestore (no -dev suffix), but mark as
experimental to ensure users know what they are signing up for.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agocommon: add 'enable experimental data corrupting features'
Sage Weil [Mon, 29 Dec 2014 19:33:00 +0000 (11:33 -0800)]
common: add 'enable experimental data corrupting features'

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #3265 from yuyuyu101/coverify-fix
Sage Weil [Mon, 29 Dec 2014 18:56:23 +0000 (10:56 -0800)]
Merge pull request #3265 from yuyuyu101/coverify-fix

Event: Avoid illegal multiplication for memset

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #3260 from nilamdyuti/wip-doc-ceph-object-gateway
John Wilkins [Mon, 29 Dec 2014 18:39:24 +0000 (10:39 -0800)]
Merge pull request #3260 from nilamdyuti/wip-doc-ceph-object-gateway

doc: Updates information for SSL configuration in Ceph Object Gateway installation.

Reviewed-by: John Wilkins <jowilkin@redhat.com>
10 years agotools: ceph-monstore-tool: validate start/stop vals 3274/head
Joao Eduardo Luis [Mon, 29 Dec 2014 17:25:58 +0000 (17:25 +0000)]
tools: ceph-monstore-tool: validate start/stop vals

on commands that use 'start' and 'stop'/'end' values, we should validate
them and inform the user when 'stop' > 'start'.

Signed-off-by: Joao Eduardo Luis <joao@redhat.com>
10 years agotools: ceph-monstore-tool: output number of paxos versions dumped
Joao Eduardo Luis [Mon, 29 Dec 2014 17:10:32 +0000 (17:10 +0000)]
tools: ceph-monstore-tool: output number of paxos versions dumped

Signed-off-by: Joao Eduardo Luis <joao@redhat.com>
10 years agotools: ceph-monstore-tool: raw map to stdout if outfile not specified
Joao Eduardo Luis [Mon, 29 Dec 2014 17:09:20 +0000 (17:09 +0000)]
tools: ceph-monstore-tool: raw map to stdout if outfile not specified

Signed-off-by: Joao Eduardo Luis <joao@redhat.com>
10 years agotools: ceph-monstore-tool: use subcmd parser helper
Joao Eduardo Luis [Mon, 29 Dec 2014 17:08:10 +0000 (17:08 +0000)]
tools: ceph-monstore-tool: use subcmd parser helper

reduces the noise in the code

Signed-off-by: Joao Eduardo Luis <joao@redhat.com>
10 years agotools: ceph_monstore_tool: add sub-command parser helper function
Joao Eduardo Luis [Mon, 29 Dec 2014 16:16:07 +0000 (16:16 +0000)]
tools: ceph_monstore_tool: add sub-command parser helper function

Signed-off-by: Joao Eduardo Luis <joao@redhat.com>
10 years agotools: ceph-monstore-tool: a cli that works
Joao Eduardo Luis [Wed, 24 Dec 2014 02:02:32 +0000 (02:02 +0000)]
tools: ceph-monstore-tool: a cli that works

Fixes: #10341
Signed-off-by: Joao Eduardo Luis <joao@redhat.com>
10 years agoEvent: Avoid illegal multiplication for memset 3265/head
Haomai Wang [Sun, 28 Dec 2014 13:31:35 +0000 (21:31 +0800)]
Event: Avoid illegal multiplication for memset

Because "file_events" is "FileEvent" type and adding an integral value to
this pointer automatically scales that value by the size.

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
10 years agomailmap: Chris Holcombe affiliation 3223/head
Yann Dupont [Fri, 19 Dec 2014 22:28:33 +0000 (23:28 +0100)]
mailmap: Chris Holcombe affiliation

10 years agomailmap: Alfredo Deza affiliation : Fix Typo.
Yann Dupont [Fri, 19 Dec 2014 23:18:39 +0000 (00:18 +0100)]
mailmap: Alfredo Deza affiliation : Fix Typo.

Signed-off-by: Yann Dupont <yann@objoo.org>
10 years agomailmap: Christos Stavrakakis affiliation
Yann Dupont [Fri, 19 Dec 2014 22:35:10 +0000 (23:35 +0100)]
mailmap: Christos Stavrakakis affiliation

Signed-off-by: Yann Dupont <yann@objoo.org>
10 years agomailmap: Ning Yao affiliation
Yann Dupont [Fri, 19 Dec 2014 22:31:56 +0000 (23:31 +0100)]
mailmap: Ning Yao affiliation

Signed-off-by: Yann Dupont <yann@objoo.org>
10 years agomailmap: Shishir Gowda affiliation
Yann Dupont [Fri, 19 Dec 2014 22:25:12 +0000 (23:25 +0100)]
mailmap: Shishir Gowda affiliation

Signed-off-by: Yann Dupont <yann@objoo.org>
10 years agomailmap: David Anderson affiliation
Yann Dupont [Fri, 19 Dec 2014 22:22:32 +0000 (23:22 +0100)]
mailmap: David Anderson affiliation

Signed-off-by: Yann Dupont <yann@objoo.org>
10 years agomailmap: Matt Benjamin affiliation
Yann Dupont [Fri, 19 Dec 2014 21:31:33 +0000 (22:31 +0100)]
mailmap: Matt Benjamin affiliation

Signed-off-by: Yann Dupont <yann@objoo.org>
10 years agomailmap: Yunchuan Wen affiliation
Yann Dupont [Fri, 19 Dec 2014 21:15:27 +0000 (22:15 +0100)]
mailmap: Yunchuan Wen affiliation

Signed-off-by: Yann Dupont <yann@objoo.org>
10 years agoMerge pull request #3255 from tchaikov/async-leak
Haomai Wang [Fri, 26 Dec 2014 14:42:33 +0000 (22:42 +0800)]
Merge pull request #3255 from tchaikov/async-leak

AsyncMessenger: fix the leak of file_events

10 years agodoc: Updates information for SSL configuration in Ceph Object Gateway installation. 3260/head
Nilamdyuti Goswami [Fri, 26 Dec 2014 14:28:57 +0000 (19:58 +0530)]
doc: Updates information for SSL configuration in Ceph Object Gateway installation.

Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
10 years agoAsyncMessenger: reset newly allocated file_events 3255/head
Kefu Chai [Fri, 26 Dec 2014 08:28:22 +0000 (16:28 +0800)]
AsyncMessenger: reset newly allocated file_events

* otherwise there is chance that Event could take them as already
  initialized ones even they are filled with random bits from heap.

10 years agoMerge pull request #3257 from mslovy/wip-y02
Sage Weil [Fri, 26 Dec 2014 04:52:06 +0000 (20:52 -0800)]
Merge pull request #3257 from mslovy/wip-y02

PG:: filter_snapc: Return immediately if no snapc need to trim

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #3256 from majianpeng/fix4
Sage Weil [Fri, 26 Dec 2014 04:48:40 +0000 (20:48 -0800)]
Merge pull request #3256 from majianpeng/fix4

FileJournal: Don't cache journal data if journal w/o directio mode

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoPG:: filter_snapc: Return immediately if no snapc need to trim 3257/head
Ning Yao [Fri, 26 Dec 2014 04:20:35 +0000 (04:20 +0000)]
PG:: filter_snapc: Return immediately if no snapc need to trim
we can return immediately if no snapc need to trim. Do not iterater snapc vector and do extra judgement and ops.

Signed-off-by: Ning Yao <zay11022@gmail.com>
10 years agoFileJournal: Don't cache journal data if journal w/o directio mode 3256/head
Jianpeng Ma [Fri, 26 Dec 2014 01:58:24 +0000 (09:58 +0800)]
FileJournal: Don't cache journal data if journal w/o directio mode

Only read journal data in osd starting.So no need to keep journal
data in kernel cache/buffer.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
10 years agoAsyncMessenger: fix the leak of file_events
Kefu Chai [Thu, 25 Dec 2014 13:44:53 +0000 (21:44 +0800)]
AsyncMessenger: fix the leak of file_events

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
10 years agomon: provide encoded canonical full OSDMap from primary 3247/head
Sage Weil [Tue, 23 Dec 2014 20:39:08 +0000 (12:39 -0800)]
mon: provide encoded canonical full OSDMap from primary

Currently we make each monitor apply the incremental and encode the full
map locally.  The original motivation was to save bandwidth, but the
savings are minimal to modest and the complexity associated with doing this
is huge.

This strategy also causes problems now that we have OSDMap crc's and old
mons/clusters may have diverging full OSDMaps due to mixed version
clusters.  See #10422

Instead, include the encoded full map in the paxos transaction.  We will
still apply the incremental and check the crc, but if it fails and we have
the correct version, reload it from disk and move on.  If we don't, we
will continue as we have before--the primary mon doesn't have support for
crc's yet.  When it does we will start verifying and/or get our
full map back into sync.

Fixes: #10422
Signed-off-by: Sage Weil <sage@redhat.com>
10 years agolibrados: only call watch_flush if necessary
Haomai Wang [Tue, 23 Dec 2014 10:38:24 +0000 (18:38 +0800)]
librados: only call watch_flush if necessary

Fix bug #10424
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
(cherry picked from commit 926a1b7468550e0c83bfa68bd45df1a6af599727)

10 years agomds: add default ctor for quota_info_t
Loic Dachary [Sat, 20 Dec 2014 00:08:33 +0000 (01:08 +0100)]
mds: add default ctor for quota_info_t

http://tracker.ceph.com/issues/10400 Fixes: #10400

Signed-off-by: Loic Dachary <ldachary@redhat.com>
(cherry picked from commit 7f1e510165f284aad3f341ff89f64d5c3e8fe60e)

10 years agoMerge pull request #3241 from ceph/wip-10415
Sage Weil [Tue, 23 Dec 2014 16:17:34 +0000 (08:17 -0800)]
Merge pull request #3241 from ceph/wip-10415

libcephfs/test.cc: close fd before umount

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #3245 from trociny/fix-10132
Sage Weil [Tue, 23 Dec 2014 16:13:35 +0000 (08:13 -0800)]
Merge pull request #3245 from trociny/fix-10132

10132: osd: tries to set ioprio when the config option is blank

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoAsyncMessenger: Fix leak memory 3219/head
Haomai Wang [Tue, 23 Dec 2014 12:27:05 +0000 (20:27 +0800)]
AsyncMessenger: Fix leak memory

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
10 years ago10132: osd: tries to set ioprio when the config option is blank 3245/head
Mykola Golub [Tue, 23 Dec 2014 11:39:33 +0000 (13:39 +0200)]
10132: osd: tries to set ioprio when the config option is blank

According to documentation, ioprio params will only be used if both
osd disk thread ioprio class and osd disk thread ioprio priority are
set to a non default value.

So, add a proper check and do not generate "set_disk_tp_priority(22)
Invalid argument" warning for the default settings.

10 years agoMakefile: Restore check
Haomai Wang [Fri, 19 Dec 2014 18:16:57 +0000 (02:16 +0800)]
Makefile: Restore check

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
10 years agoAsyncConnection: Init peer_global_seq
Haomai Wang [Fri, 19 Dec 2014 14:41:48 +0000 (22:41 +0800)]
AsyncConnection: Init peer_global_seq

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
10 years agotest_msgr: Avoid deadlock between send_message and dispatch
Haomai Wang [Fri, 19 Dec 2014 14:28:54 +0000 (22:28 +0800)]
test_msgr: Avoid deadlock between send_message and dispatch

If connection holds Connection's lock and try to acquire
FakeDispatcher's lock while gtest thread try to send_message with
FakeDispatcher's lock and try to acquire Connection's lock,
it will be deadlock.

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
10 years agoAsyncMessenger: Make learn_addr async to avoid destroying lock rule
Haomai Wang [Fri, 19 Dec 2014 14:25:58 +0000 (22:25 +0800)]
AsyncMessenger: Make learn_addr async to avoid destroying lock rule

Make learn_addr become a async op, otherwise holding connection's
lock then acquire messenger's lock will destroy lock rule.

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
10 years agoAsyncConnection:: Avoid getting stopping connection
Haomai Wang [Fri, 19 Dec 2014 14:13:31 +0000 (22:13 +0800)]
AsyncConnection:: Avoid getting stopping connection

Now AsyncConnection::_stop may consume a little time on deleting time events,
it may occur that accepting a connection get this stopping connection
because unregister call isn't met.

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
10 years agoAsyncConnection: Ensure reply connect_seq larger than sent
Haomai Wang [Fri, 19 Dec 2014 14:07:13 +0000 (22:07 +0800)]
AsyncConnection: Ensure reply connect_seq larger than sent

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
10 years agoMerge pull request #3243 from yuyuyu101/wip-10424
Loic Dachary [Tue, 23 Dec 2014 11:12:12 +0000 (12:12 +0100)]
Merge pull request #3243 from yuyuyu101/wip-10424

librados: only call watch_flush if necessary

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agolibrados: only call watch_flush if necessary 3243/head
Haomai Wang [Tue, 23 Dec 2014 10:38:24 +0000 (18:38 +0800)]
librados: only call watch_flush if necessary

Fix bug #10424
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
10 years agolibcephfs/test.cc: close fd before umount 3241/head
Yan, Zheng [Tue, 23 Dec 2014 02:22:00 +0000 (10:22 +0800)]
libcephfs/test.cc: close fd before umount

Fixes: #10415
Signed-off-by: Yan, Zheng <zyan@redhat.com>
10 years agolibrados: warn about rados_watch_flush() prior to ioctx shutdown
Sage Weil [Mon, 22 Dec 2014 21:56:07 +0000 (13:56 -0800)]
librados: warn about rados_watch_flush() prior to ioctx shutdown

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 1fbe9b6f3a67584829fe17b6bb08cfa1b787d82c)

10 years agolibrados: watch_flush() on shutdown
Sage Weil [Fri, 19 Dec 2014 19:50:38 +0000 (11:50 -0800)]
librados: watch_flush() on shutdown

Users can easily forget this. It makes shutdown potentially block, but if
they have racing callbacks they get what they ask for.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 30678f6daf0a71b6074c061c6b4aec6386372368)

10 years agolibrados: add rados_watch_flush() call
Sage Weil [Fri, 19 Dec 2014 19:48:27 +0000 (11:48 -0800)]
librados: add rados_watch_flush() call

Add a call so that callers can make sure all queued callbacks have
completed before shutting down the ioctx.  This avoids a segv triggered
by the LibRadosWatchNotifyPPTests/LibRadosWatchNotifyPP.WatchNotify2Timeout/1
test due to the ioctx being destroyed when the in-progress callback
does a notify_ack.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 4ebd4b4280cb048547842351f41b38658fb21a6e)

10 years agoosdc/Objecter: do notify completion callback in fast-dispatch context
Sage Weil [Fri, 19 Dec 2014 16:37:00 +0000 (08:37 -0800)]
osdc/Objecter: do notify completion callback in fast-dispatch context

The notify completion has exactly one user, the librados caller which
does nothing but take a local (inner) lock and signal a Cond.  Do this
in the fast-dispatch context for simplicity.

Notably, this makes the notify completion (and timeout) trigger a
notify2() return (with ETIMEDOUT) even when the finisher queue that
normally delivers notify is busy.. for example with a notify that is
being very slow.  In our case, the unit test is doing a sleep(3) to
test timeouts but also prevented the ETIMEDOUT notification from
being delivered to the caller.  This patch resolves that.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 9b78dafd4a80ad9a557cfdf17d10fb2bff236f1a)

10 years agoMerge pull request #3200 from boydc2014/master
Loic Dachary [Mon, 22 Dec 2014 23:56:17 +0000 (00:56 +0100)]
Merge pull request #3200 from boydc2014/master

fix unmatched op code

Reviewed-by: Loic Dachary <ldachary@redhat.com>