]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
10 years agodoc: recommendations related to performances / cleanup 4671/head
Loic Dachary [Wed, 13 May 2015 20:28:14 +0000 (22:28 +0200)]
doc: recommendations related to performances / cleanup

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #4151 from dmitryya/issue_7401
Loic Dachary [Wed, 13 May 2015 18:00:25 +0000 (20:00 +0200)]
Merge pull request #4151 from dmitryya/issue_7401

obj_bencher: status_printer waits before the first calculation

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #4552 from stiopaa1/bufferLinkage
Loic Dachary [Wed, 13 May 2015 17:57:14 +0000 (19:57 +0200)]
Merge pull request #4552 from stiopaa1/bufferLinkage

common/buffer.cc: change linkage of few variables to internal

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #4663 from dachary/wip-11598-ceph-detect-init
Loic Dachary [Wed, 13 May 2015 17:14:31 +0000 (19:14 +0200)]
Merge pull request #4663 from dachary/wip-11598-ceph-detect-init

ceph-detect-init: plain setup.py install on make install

Reviewed-by: Kernel Neophyte <neophyte.hacker001@gmail.com>
10 years agoMerge pull request #4666 from SUSE/wip-11610-next
Ken Dreyer [Wed, 13 May 2015 16:05:43 +0000 (10:05 -0600)]
Merge pull request #4666 from SUSE/wip-11610-next

ceph.spec.in: include SUSE in _with_systemd

Reviewed-by: Loic Dachary <ldachary@redhat.com>
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
10 years agotests: disable deep-flatten feature for the krbd fsx test
Ilya Dryomov [Wed, 13 May 2015 14:10:39 +0000 (17:10 +0300)]
tests: disable deep-flatten feature for the krbd fsx test

krbd doesn't support fast-diff or deep-flatten yet.  Had to do this
with two commits because fast-diff is in next and deep-flatten isn't.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
10 years agoMerge remote-tracking branch 'origin/next'
Ilya Dryomov [Wed, 13 May 2015 14:00:44 +0000 (17:00 +0300)]
Merge remote-tracking branch 'origin/next'

10 years agoMerge pull request #4665 from ceph/wip-11551-next
Ilya Dryomov [Wed, 13 May 2015 13:57:05 +0000 (16:57 +0300)]
Merge pull request #4665 from ceph/wip-11551-next

tests: disable new RBD features for the krbd fsx test

Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
10 years agoMerge pull request #4644 from ceph/wip-11405
Josh Durgin [Wed, 13 May 2015 13:53:07 +0000 (06:53 -0700)]
Merge pull request #4644 from ceph/wip-11405

librbd: new QA client upgrade tests

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agotests: disable fast-diff feature for the krbd fsx test 4665/head
Jason Dillaman [Wed, 13 May 2015 12:08:46 +0000 (08:08 -0400)]
tests: disable fast-diff feature for the krbd fsx test

The kernel does not yet support fast-diff.

Fixes: #11551
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agoMerge pull request #4627 from dachary/wip-install-deps-clean
Kefu Chai [Wed, 13 May 2015 13:44:04 +0000 (21:44 +0800)]
Merge pull request #4627 from dachary/wip-install-deps-clean

install-deps.sh: only pip install after make clean

Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agoceph.spec.in: include SUSE in _with_systemd 4666/head
Nathan Cutler [Wed, 13 May 2015 12:57:48 +0000 (14:57 +0200)]
ceph.spec.in: include SUSE in _with_systemd

The master specfile newly defines a _with_systemd variable that should be true
for the set of distros that are using systemd. Since this set of distros
includes SUSE/openSUSE (at least for the more recent versions where ceph is
supported), this commit sets _with_systemdto true on SUSE/openSUSE.

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

Signed-off-by: Nathan Cutler <ncutler@suse.cz>
10 years agoMerge pull request #4536 from ceph/wip-mds-snaps
John Spray [Wed, 13 May 2015 10:56:09 +0000 (12:56 +0200)]
Merge pull request #4536 from ceph/wip-mds-snaps

Wip mds snaps

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
10 years agoceph-detect-init: plain setup.py install on make install 4663/head
Loic Dachary [Wed, 13 May 2015 10:45:58 +0000 (12:45 +0200)]
ceph-detect-init: plain setup.py install on make install

If no DESTDIR environment variable is set, just

  python setup.py install

instead of setting --root, --prefix or --install-layout. These options
are tested to do the right thing in the context of RPM and deb packaging
but they are presumably not what someone using make install manually
would want.

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

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #4646 from theanalyst/doc/release/v0.94.2
Loic Dachary [Wed, 13 May 2015 07:32:45 +0000 (09:32 +0200)]
Merge pull request #4646 from theanalyst/doc/release/v0.94.2

doc: more entries for release notes in v0.94.2

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agodoc: more entries for release notes in v0.94.2 4646/head
Abhishek Lekshmanan [Mon, 11 May 2015 16:16:33 +0000 (21:46 +0530)]
doc: more entries for release notes in v0.94.2

Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@ril.com>
10 years agoinstall-deps.sh: only pip install after make clean 4627/head
Loic Dachary [Fri, 8 May 2015 18:53:54 +0000 (20:53 +0200)]
install-deps.sh: only pip install after make clean

Do not re-install all python dependencies if there already exists a
wheelhouse directory. It makes it so running install-deps.sh twice will
only access the network the first time. The directories where the python
dependencies are installed are removed by make clean. Refreshing the
python dependencies cache can be done via make clean ; install-deps.sh

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #4521 from tchaikov/wip-fix-malformed_input-macros
Kefu Chai [Wed, 13 May 2015 03:29:57 +0000 (11:29 +0800)]
Merge pull request #4521 from tchaikov/wip-fix-malformed_input-macros

common: fix the macros for malformed_input::what()

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agocommon: fix the macros for malformed_input::what() 4521/head
Kefu Chai [Fri, 1 May 2015 11:52:25 +0000 (04:52 -0700)]
common: fix the macros for malformed_input::what()

the thrown exception of malformed_input should carry the function name in
which it was thrown. but what we have now is something like:
"buffer::malformed_input: __PRETTY_FUNCTION__ unknown encoding version >
100"
because __PRETTY_FUNCTION__ is not a macro any more. see
- https://gcc.gnu.org/onlinedocs/gcc-3.1/gcc/Function-Names.html
- https://gcc.gnu.org/onlinedocs/gcc/Function-Names.html
and it is not a string literal, so neither can we can concat it with
the literal err message.

Signed-off-by: Kefu Chai <kchai@redhat.com>
10 years agoMerge pull request #4656 from ceph/wip-rbd-xfstests-201505
Josh Durgin [Tue, 12 May 2015 16:16:21 +0000 (09:16 -0700)]
Merge pull request #4656 from ceph/wip-rbd-xfstests-201505

RBD: expunge test broken by xfs commit

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agoMerge pull request #4655 from ceph/wip-add-ceph-create-keys.rst
Loic Dachary [Tue, 12 May 2015 16:09:57 +0000 (18:09 +0200)]
Merge pull request #4655 from ceph/wip-add-ceph-create-keys.rst

doc: add ceph-create-keys.rst to dist tarball

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoRBD: expunge test broken by xfs commit 4656/head
Douglas Fuller [Tue, 12 May 2015 16:00:28 +0000 (09:00 -0700)]
RBD: expunge test broken by xfs commit

expunge generic/231, broken for disk and rbd by kernel commit 04162bb

Signed-off-by: Douglas Fuller <dfuller@redhat.com>
10 years agodoc: add ceph-create-keys.rst to dist tarball 4655/head
Kefu Chai [Tue, 12 May 2015 14:34:46 +0000 (07:34 -0700)]
doc: add ceph-create-keys.rst to dist tarball

Fixes: #10725
Signed-off-by: Kefu Chai <kchai@redhat.com>
10 years agoMerge pull request #4412 from tchaikov/wip-add-man-page
Loic Dachary [Tue, 12 May 2015 14:03:07 +0000 (16:03 +0200)]
Merge pull request #4412 from tchaikov/wip-add-man-page

doc: add man page for ceph-create-keys

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #4522 from ceph/wip-cephfs-reset-fixes
John Spray [Tue, 12 May 2015 11:45:34 +0000 (13:45 +0200)]
Merge pull request #4522 from ceph/wip-cephfs-reset-fixes

Fixes to resets of tables and journal with damaged metadata

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
10 years agotools: fix tabletool reset of nonexistent sessionmap 4522/head
John Spray [Mon, 11 May 2015 11:53:52 +0000 (12:53 +0100)]
tools: fix tabletool reset of nonexistent sessionmap

If the object didn't exist, the omap clear was failing
and preventing the subsueent omap set header from
executing.  Set the FAILOK flag on the omap clear
sub-operation.

Signed-off-by: John Spray <john.spray@redhat.com>
10 years agotools: improve journaltool reset
John Spray [Thu, 30 Apr 2015 10:44:04 +0000 (11:44 +0100)]
tools: improve journaltool reset

Handle the case where no journal objects exist at all,
rather than just resetting a journal that already exists.

Signed-off-by: John Spray <john.spray@redhat.com>
10 years agomds: expose static default file layout methods
John Spray [Mon, 11 May 2015 12:03:36 +0000 (13:03 +0100)]
mds: expose static default file layout methods

So that tools can invoke these to get the defaults
without a fully baked MDCache.

Signed-off-by: John Spray <john.spray@redhat.com>
10 years agotools: fix tabletool reset snap
John Spray [Wed, 29 Apr 2015 19:44:12 +0000 (20:44 +0100)]
tools: fix tabletool reset snap

SnapServer has an encode method defined that
is different to encode_state, whereas in InoTable
the two were synonmous.  This code was working
previously for inotable but not for snapserver.

Signed-off-by: John Spray <john.spray@redhat.com>
10 years agoMerge pull request #4652 from ceph/wip-11541
John Spray [Tue, 12 May 2015 08:47:48 +0000 (10:47 +0200)]
Merge pull request #4652 from ceph/wip-11541

mds: clear CDir::STATE_REJOINUNDEF after fetching dirfrag

Reviewed-by: John Spray <john.spray@redhat.com>
10 years agomds: clear CDir::STATE_REJOINUNDEF after fetching dirfrag 4652/head
Yan, Zheng [Tue, 12 May 2015 06:52:30 +0000 (14:52 +0800)]
mds: clear CDir::STATE_REJOINUNDEF after fetching dirfrag

Fixes: #11541
Signed-off-by: Yan, Zheng <zyan@redhat.com>
10 years agoMerge pull request #4545 from dachary/wip-mailmap
Loic Dachary [Mon, 11 May 2015 18:23:34 +0000 (20:23 +0200)]
Merge pull request #4545 from dachary/wip-mailmap

mailmap updates

10 years agomailmap: Jean-Charles Lopez affiliation 4545/head
Loic Dachary [Thu, 7 May 2015 14:28:00 +0000 (16:28 +0200)]
mailmap: Jean-Charles Lopez affiliation

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agomailmap: Hervé Rousseau affiliation
Loic Dachary [Tue, 5 May 2015 11:59:04 +0000 (13:59 +0200)]
mailmap: HervĂ© Rousseau affiliation

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agomailmap: Rajesh Nambiar affiliation
Loic Dachary [Tue, 5 May 2015 11:58:50 +0000 (13:58 +0200)]
mailmap: Rajesh Nambiar affiliation

Reviewed-by: Rajesh Nambiar <rajesh.n@msystechnologies.com>
Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agomailmap: Douglas Fuller affiliation
Loic Dachary [Tue, 5 May 2015 11:58:37 +0000 (13:58 +0200)]
mailmap: Douglas Fuller affiliation

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agomailmap: Orit Wasserman affiliation
Loic Dachary [Tue, 5 May 2015 11:58:22 +0000 (13:58 +0200)]
mailmap: Orit Wasserman affiliation

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agomailmap: Nathan Cutler affiliation
Loic Dachary [Tue, 5 May 2015 11:58:08 +0000 (13:58 +0200)]
mailmap: Nathan Cutler affiliation

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agomailmap: Tim Serong affiliation
Loic Dachary [Tue, 5 May 2015 11:57:50 +0000 (13:57 +0200)]
mailmap: Tim Serong affiliation

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agomailmap: Fabio Alessandro Locati affiliation
Loic Dachary [Tue, 5 May 2015 11:57:27 +0000 (13:57 +0200)]
mailmap: Fabio Alessandro Locati affiliation

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agomailmap: Henry Chang affiliation
Loic Dachary [Tue, 5 May 2015 11:57:08 +0000 (13:57 +0200)]
mailmap: Henry Chang affiliation

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agomailmap: Gerhard Muntingh affiliation
Loic Dachary [Tue, 5 May 2015 11:56:55 +0000 (13:56 +0200)]
mailmap: Gerhard Muntingh affiliation

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agomailmap: Alistair Israel affiliation
Loic Dachary [Tue, 5 May 2015 11:56:36 +0000 (13:56 +0200)]
mailmap: Alistair Israel affiliation

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agomailmap: Sergey Arkhipov affiliation
Loic Dachary [Tue, 5 May 2015 11:56:00 +0000 (13:56 +0200)]
mailmap: Sergey Arkhipov affiliation

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agomailmap: Neha Ummareddy affiliation
Loic Dachary [Tue, 5 May 2015 11:55:30 +0000 (13:55 +0200)]
mailmap: Neha Ummareddy affiliation

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agomailmap: Xingyi Wu affiliation
Loic Dachary [Tue, 5 May 2015 11:54:57 +0000 (13:54 +0200)]
mailmap: Xingyi Wu affiliation

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agomailmap: Ning Yao affiliation
Loic Dachary [Tue, 5 May 2015 11:53:11 +0000 (13:53 +0200)]
mailmap: Ning Yao affiliation

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agomailmap: Joao Eduardo Luis affiliation
Loic Dachary [Tue, 5 May 2015 11:51:52 +0000 (13:51 +0200)]
mailmap: Joao Eduardo Luis affiliation

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #4525 from athanatos/wip-11358
Sage Weil [Mon, 11 May 2015 18:12:24 +0000 (11:12 -0700)]
Merge pull request #4525 from athanatos/wip-11358

Wip 11358

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #4648 from athanatos/wip-11439
Samuel Just [Mon, 11 May 2015 18:09:35 +0000 (11:09 -0700)]
Merge pull request #4648 from athanatos/wip-11439

Add separate suicide timeout configs

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #4365 from ceph/wip-digest-repair
Samuel Just [Mon, 11 May 2015 17:41:13 +0000 (10:41 -0700)]
Merge pull request #4365 from ceph/wip-digest-repair

osd: fix repair when recorded digest is wrong

Reviewed-by: Samuel Just <sjust@redhat.com>
10 years agoMerge pull request #4252 from wonzhq/make_writeable
Samuel Just [Mon, 11 May 2015 17:38:24 +0000 (10:38 -0700)]
Merge pull request #4252 from wonzhq/make_writeable

osd: fixes for make_writeable

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agoMerge pull request #4450 from big-henry/wip-journal
Samuel Just [Mon, 11 May 2015 17:37:51 +0000 (10:37 -0700)]
Merge pull request #4450 from big-henry/wip-journal

FileJournal: fix check_for_full

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com
Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agoMerge pull request #4293 from ajs1984/master
Samuel Just [Mon, 11 May 2015 17:35:17 +0000 (10:35 -0700)]
Merge pull request #4293 from ajs1984/master

librados: Add config observer for Objecter instance.

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agoMerge pull request #4352 from majianpeng/misc-fix
Samuel Just [Mon, 11 May 2015 17:34:53 +0000 (10:34 -0700)]
Merge pull request #4352 from majianpeng/misc-fix

Misc fix

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Joao Eduardo Luis <joao@suse.de>
10 years agoMerge pull request #4452 from tchaikov/wip-interactive-ceph-cli
Samuel Just [Mon, 11 May 2015 17:29:40 +0000 (10:29 -0700)]
Merge pull request #4452 from tchaikov/wip-interactive-ceph-cli

Wip interactive ceph cli

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #4494 from ceph/wip-int-option-overflow
Samuel Just [Mon, 11 May 2015 17:27:55 +0000 (10:27 -0700)]
Merge pull request #4494 from ceph/wip-int-option-overflow

Wip int option overflow

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #4645 from ceph/wip-fix-BTBFS-message-monmetadata
Joao Eduardo Luis [Mon, 11 May 2015 16:23:52 +0000 (17:23 +0100)]
Merge pull request #4645 from ceph/wip-fix-BTBFS-message-monmetadata

mon: fix the FTBFS

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
10 years agomon: fix the FTBFS 4645/head
Kefu Chai [Mon, 11 May 2015 15:52:36 +0000 (08:52 -0700)]
mon: fix the FTBFS

put the messages/MMonMetadata.h into the dist tarball.

Fixes: #10904
Signed-off-by: Kefu Chai <kchai@redhat.com>
10 years agoMerge pull request #4626 from trhoden/bootstrap-rgw
Ken Dreyer [Mon, 11 May 2015 15:37:56 +0000 (09:37 -0600)]
Merge pull request #4626 from trhoden/bootstrap-rgw

debian: add bootstrap-rgw dir to ceph package

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
10 years agoMerge pull request #4609 from trhoden/ceph-spec-rgw
Ken Dreyer [Mon, 11 May 2015 15:18:22 +0000 (09:18 -0600)]
Merge pull request #4609 from trhoden/ceph-spec-rgw

Add rgw placeholder directories to ceph-radosgw package

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #4227 from tchaikov/node-ls
Kefu Chai [Mon, 11 May 2015 14:01:21 +0000 (22:01 +0800)]
Merge pull request #4227 from tchaikov/node-ls

mon,osd,mds: add "{mon,mds} metadata" and "node ls" commands

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
10 years agoMerge pull request #4551 from theanalyst/doc/release/v0.94.2
Loic Dachary [Mon, 11 May 2015 12:48:03 +0000 (14:48 +0200)]
Merge pull request #4551 from theanalyst/doc/release/v0.94.2

doc: release notes for hammer v0.94.2 (draft)

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agodoc: release notes for hammer v0.94.2 4551/head
Abhishek Lekshmanan [Mon, 11 May 2015 12:40:59 +0000 (18:10 +0530)]
doc: release notes for hammer v0.94.2

Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@ril.com>
Conflicts:
doc/release-notes.rst

10 years agoMerge pull request #4624 from rajukv/wip-xio-rajukv
Kefu Chai [Mon, 11 May 2015 07:12:34 +0000 (15:12 +0800)]
Merge pull request #4624 from rajukv/wip-xio-rajukv

xio: Update XIO client connection IP and nonce

Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agoMerge pull request #4620 from yuyuyu101/wip-async-fix-10
Haomai Wang [Mon, 11 May 2015 05:48:59 +0000 (13:48 +0800)]
Merge pull request #4620 from yuyuyu101/wip-async-fix-10

AsyncConnection: Avoid assert since replacing may inject when unlock

10 years agoUpdate XIO client connection IP and nonce 4624/head
Raju Kurunkad [Tue, 5 May 2015 14:10:38 +0000 (19:40 +0530)]
Update XIO client connection IP and nonce

Obtain the local IP of the client and save the nonce provided when the messenger was created. This is required for RBD lock/unlock
Fix script error in RBD concurrent test
Reset did_bind during messenger shutdown

Signed-off-by: Raju Kurunkad <raju.kurunkad@sandisk.com>
10 years agoMerge pull request #4640 from SUSE/wip-rbd-recover-tool-typo-fix
Loic Dachary [Sun, 10 May 2015 18:16:30 +0000 (20:16 +0200)]
Merge pull request #4640 from SUSE/wip-rbd-recover-tool-typo-fix

doc: rbd-recover-tool: fix typos in comments

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #4637 from SUSE/wip-rados-gw-comment-fix
Loic Dachary [Sun, 10 May 2015 18:13:37 +0000 (20:13 +0200)]
Merge pull request #4637 from SUSE/wip-rados-gw-comment-fix

doc: rgw: fix typo in comments

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agodoc: rbd-recover-tool: fix typos in comments 4640/head
Nathan Cutler [Sun, 10 May 2015 16:26:52 +0000 (18:26 +0200)]
doc: rbd-recover-tool: fix typos in comments

Signed-off-by: Nathan Cutler <ncutler@suse.cz>
10 years agodoc: rgw: fix typo in comments 4637/head
Nathan Cutler [Sun, 10 May 2015 16:17:53 +0000 (18:17 +0200)]
doc: rgw: fix typo in comments

Signed-off-by: Nathan Cutler <ncutler@suse.cz>
10 years agoMerge pull request #4628 from dachary/wip-releases
Sage Weil [Fri, 8 May 2015 22:01:52 +0000 (15:01 -0700)]
Merge pull request #4628 from dachary/wip-releases

doc: add release numbering explanation

10 years agodoc: add release numbering explanation 4628/head
Loic Dachary [Fri, 8 May 2015 20:27:27 +0000 (22:27 +0200)]
doc: add release numbering explanation

Mostly copy pasted from Sage's email "The first infernalis dev release
will be v9.0.0".

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agodoc: move the release cycle after the timeline
Loic Dachary [Fri, 8 May 2015 20:25:21 +0000 (22:25 +0200)]
doc: move the release cycle after the timeline

The timeline is a useful reference and the reader should not have to
scroll down to see it. Move the release cycle after the timeline.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #4541 from jbernard/master
Josh Durgin [Fri, 8 May 2015 18:50:38 +0000 (11:50 -0700)]
Merge pull request #4541 from jbernard/master

common/admin_socket: close socket descriptor in destructor

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agoMerge pull request #4623 from ceph/wip-11577
Josh Durgin [Fri, 8 May 2015 18:44:35 +0000 (11:44 -0700)]
Merge pull request #4623 from ceph/wip-11577

librbd: possible deadlock during copyup

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agodebian: add bootstrap-rgw dir to ceph package 4626/head
Travis Rhoden [Fri, 8 May 2015 18:08:34 +0000 (14:08 -0400)]
debian: add bootstrap-rgw dir to ceph package

Signed-off-by: Travis Rhoden <trhoden@redhat.com>
10 years agopackaging: Add rgw placeholder dirs in proper packages 4609/head
Travis Rhoden [Fri, 8 May 2015 00:13:53 +0000 (20:13 -0400)]
packaging: Add rgw placeholder dirs in proper packages

Automatically create /var/lib/ceph/radosgw with the
ceph-radosgw package, and /var/lib/ceph/bootstrap-rgw
via the ceph package.

Signed-off-by: Travis Rhoden <trhoden@redhat.com>
10 years agolibrbd: object map clean state valid only for fast-diff 4623/head
Jason Dillaman [Fri, 8 May 2015 14:30:22 +0000 (10:30 -0400)]
librbd: object map clean state valid only for fast-diff

The deep-flatten feature bit is incorrectly used to determine
whether to set the object map to clean.  It should use the
fast-diff feature bit.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agocommon/admin_socket: close socket descriptor in destructor 4541/head
Jon Bernard [Fri, 8 May 2015 15:54:06 +0000 (11:54 -0400)]
common/admin_socket: close socket descriptor in destructor

Long-running processes that do not reuse a single client connection will
see accumulating file descriptors as a result of not closing the
listening socket.  In this case, eventually the system will reach
file-max and subsequent connections will fail.

Fixes: #11535
Signed-off-by: Jon Bernard <jbernard@tuxion.com>
10 years agoAsyncConnection: Avoid assert since replacing may inject when unlock 4620/head
Haomai Wang [Fri, 8 May 2015 14:56:49 +0000 (22:56 +0800)]
AsyncConnection: Avoid assert since replacing may inject when unlock

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
10 years agoMerge pull request #4621 from dachary/wip-pip-timeout
Kefu Chai [Fri, 8 May 2015 15:49:46 +0000 (23:49 +0800)]
Merge pull request #4621 from dachary/wip-pip-timeout

install-deps.sh: increase pip install timeout

Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agoMerge pull request #4601 from oritwas/nss-cmake
Yehuda Sadeh [Fri, 8 May 2015 15:19:41 +0000 (08:19 -0700)]
Merge pull request #4601 from oritwas/nss-cmake

cmake fixes

10 years agoinstall-deps.sh: increase pip install timeout 4621/head
Loic Dachary [Fri, 8 May 2015 15:06:25 +0000 (17:06 +0200)]
install-deps.sh: increase pip install timeout

It is not uncommon for pip install to timeout with:

   Cannot fetch index base URL https://pypi.python.org/simple

because the default timeout is 15 seconds. When running from a CI, it
translates into bursts of false negatives when the network is saturated.

Increase the timeout to 10 minutes which is hopefully large enough to
only happen when there is a serious network problem.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agodoc: Fix .gitignore for 'doc' directory
Kefu Chai [Fri, 8 May 2015 13:04:02 +0000 (21:04 +0800)]
doc: Fix .gitignore for 'doc' directory

caused by: 156e55b7f95bb7f1d73e1131d94aca75fb339315

Fixes: #11574
Signed-off-by: Kefu Chai <kchai@redhat.com>
10 years agoMerge pull request #4588 from dachary/wip-11398-kill-daemons
Kefu Chai [Fri, 8 May 2015 10:26:09 +0000 (18:26 +0800)]
Merge pull request #4588 from dachary/wip-11398-kill-daemons

tests: ceph-helpers kill_daemons fails when kill fails

Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agoMerge pull request #4616 from ceph/wip-fix-FTBFS-boost-1.58
Kefu Chai [Fri, 8 May 2015 10:18:05 +0000 (18:18 +0800)]
Merge pull request #4616 from ceph/wip-fix-FTBFS-boost-1.58

mon: remove unused variable

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agocmake: add common_utf8 lib to link unittest_str_map 4601/head
Orit Wasserman [Thu, 7 May 2015 09:01:45 +0000 (11:01 +0200)]
cmake: add common_utf8 lib to link unittest_str_map

Signed-off-by: Orit Wasserman <owasserm@redhat.com>
10 years agocmake: Add missing pthread lib
Orit Wasserman [Thu, 7 May 2015 08:36:29 +0000 (10:36 +0200)]
cmake: Add missing pthread lib

Signed-off-by: Orit Wasserman <owasserm@redhat.com>
10 years agocmake add mds and librbd missing files
Orit Wasserman [Thu, 7 May 2015 09:11:12 +0000 (11:11 +0200)]
cmake add mds and librbd missing files

Signed-off-by: Orit Wasserman <owasserm@redhat.com>
10 years agocmake: add crc assembley files
Orit Wasserman [Thu, 7 May 2015 09:16:31 +0000 (11:16 +0200)]
cmake: add crc assembley files

Signed-off-by: Orit Wasserman <owasserm@redhat.com>
10 years agoMerge pull request #4615 from dachary/wip-11575-pip-log
Kefu Chai [Fri, 8 May 2015 08:51:09 +0000 (16:51 +0800)]
Merge pull request #4615 from dachary/wip-11575-pip-log

tests: pip must not log in $HOME/.pip

Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agotests: ceph-helpers kill_daemons fails when kill fails 4588/head
Loic Dachary [Wed, 6 May 2015 18:14:37 +0000 (20:14 +0200)]
tests: ceph-helpers kill_daemons fails when kill fails

Instead of silently leaving the daemons running, it returns failure so
the caller can decide what to do with this situation. The timeout is
also extended to minutes instead of seconds to gracefully handle the
rare situations when a machine is extra slow for some reason.

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

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agomon: remove unused variable 4616/head
Kefu Chai [Fri, 8 May 2015 07:21:20 +0000 (15:21 +0800)]
mon: remove unused variable

* as a side effect, this change silences
  http://tracker.ceph.com/issues/11576

Fixes: #11576
Signed-off-by: Kefu Chai <kchai@redhat.com>
10 years agoinstall-deps.sh: exit on error if dependencies cannot be installed 4615/head
Loic Dachary [Fri, 8 May 2015 07:19:44 +0000 (09:19 +0200)]
install-deps.sh: exit on error if dependencies cannot be installed

Now that pre-installing pip dependencies is done at the end of the
script, the last command to run is no longer the installation
command. Therefore the status of the script is no longer the status of
the install command and no longer reflect success or failure to install
the dependencies. Add explicit || exit 1 to commands that are to be
treated as fatal errors.

Also set -e so that another error has a better chance to be caught.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agotests: pip must not log in $HOME/.pip
Loic Dachary [Fri, 8 May 2015 06:57:24 +0000 (08:57 +0200)]
tests: pip must not log in $HOME/.pip

Because it may not have permission to when running in a container and
scripts run from source are not expected to modify anything outside of
the source tree anyway.

Signed-off-by: Loic Dachary <loic@dachary.org>
10 years agoMerge pull request #4614 from ceph/wip-11574-fix-FTBFS
Gregory Farnum [Fri, 8 May 2015 04:55:36 +0000 (21:55 -0700)]
Merge pull request #4614 from ceph/wip-11574-fix-FTBFS

json_sprit: fix the FTBFS on old gcc

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
10 years agojson_sprit: fix the FTBFS on old gcc 4614/head
Kefu Chai [Fri, 8 May 2015 04:01:16 +0000 (12:01 +0800)]
json_sprit: fix the FTBFS on old gcc

Fixes: #11574
Signed-off-by: Kefu Chai <kchai@redhat.com>
10 years agoMerge pull request #4611 from yuyuyu101/wip-async-fix-9
Haomai Wang [Fri, 8 May 2015 03:00:08 +0000 (11:00 +0800)]
Merge pull request #4611 from yuyuyu101/wip-async-fix-9

AsyncConnection: verify connection's state is expected

10 years agoAsyncConnection: verify connection's state is expected 4611/head
Haomai Wang [Fri, 8 May 2015 02:24:37 +0000 (10:24 +0800)]
AsyncConnection: verify connection's state is expected

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>