]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
10 years agodoc: Updates the radosgw man page with some changes. 4260/head
Nilamdyuti Goswami [Thu, 2 Apr 2015 17:53:14 +0000 (23:23 +0530)]
doc: Updates the radosgw man page with some changes.

Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
10 years agodoc: Updates simple gateway configuration file with some changes.
Nilamdyuti Goswami [Thu, 2 Apr 2015 17:51:26 +0000 (23:21 +0530)]
doc: Updates simple gateway configuration file with some changes.

Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
10 years agodoc: Updates gateway installation doc with some changes.
Nilamdyuti Goswami [Thu, 2 Apr 2015 17:48:26 +0000 (23:18 +0530)]
doc: Updates gateway installation doc with some changes.

Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
10 years agoMerge branch 'wip-doc-ceph-object-gateway' of https://github.com/nilamdyuti/ceph...
Nilamdyuti Goswami [Thu, 2 Apr 2015 17:35:22 +0000 (23:05 +0530)]
Merge branch 'wip-doc-ceph-object-gateway' of https://github.com/nilamdyuti/ceph into wip-doc-ceph-object-gateway

10 years agodoc: Updates the configuration of mod_proxy_fcgi in terms of localhost
Nilamdyuti Goswami [Thu, 2 Apr 2015 14:12:54 +0000 (19:42 +0530)]
doc: Updates the configuration of mod_proxy_fcgi in terms of localhost
tcp and unix domain socket.

Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
10 years agodoc: Corrects syntax highlighting in the simple gateway configuration doc.
Nilamdyuti Goswami [Thu, 2 Apr 2015 13:56:08 +0000 (19:26 +0530)]
doc: Corrects syntax highlighting in the simple gateway configuration doc.

Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
10 years agodoc: Corrects syntax highlighting in gateway installation doc.
Nilamdyuti Goswami [Thu, 2 Apr 2015 13:51:46 +0000 (19:21 +0530)]
doc: Corrects syntax highlighting in gateway installation doc.

Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
10 years agodoc: Updates the simple gateway configuration doc with configuration for
Nilamdyuti Goswami [Thu, 2 Apr 2015 11:19:58 +0000 (16:49 +0530)]
doc: Updates the simple gateway configuration doc with configuration for
mod_proxy_fcgi instead of mod_fastcgi.

Fixes: #3299
Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
10 years agodoc: Replaces reference to mod_fastcgi with mod_proxy_fcgi in gateway
Nilamdyuti Goswami [Thu, 2 Apr 2015 11:14:38 +0000 (16:44 +0530)]
doc: Replaces reference to mod_fastcgi with mod_proxy_fcgi in gateway
installation doc.

Fixes: #3299
Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
10 years agoMerge pull request #4142 from ceph/wip-no-more-dot-8
Loic Dachary [Thu, 2 Apr 2015 15:42:23 +0000 (17:42 +0200)]
Merge pull request #4142 from ceph/wip-no-more-dot-8

doc: generate man pages in man/Makefile

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agodoc: Updates the configuration of mod_proxy_fcgi in terms of localhost
Nilamdyuti Goswami [Thu, 2 Apr 2015 14:12:54 +0000 (19:42 +0530)]
doc: Updates the configuration of mod_proxy_fcgi in terms of localhost
tcp and unix domain socket.

Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
10 years agoMerge pull request #4220 from jdurgin/wip-librados-global-flags
Loic Dachary [Thu, 2 Apr 2015 14:02:55 +0000 (16:02 +0200)]
Merge pull request #4220 from jdurgin/wip-librados-global-flags

Revert "librados: remove the unused flags."

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agodoc: Corrects syntax highlighting in the simple gateway configuration doc.
Nilamdyuti Goswami [Thu, 2 Apr 2015 13:56:08 +0000 (19:26 +0530)]
doc: Corrects syntax highlighting in the simple gateway configuration doc.

Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
10 years agodoc: Corrects syntax highlighting in gateway installation doc.
Nilamdyuti Goswami [Thu, 2 Apr 2015 13:51:46 +0000 (19:21 +0530)]
doc: Corrects syntax highlighting in gateway installation doc.

Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
10 years agodoc: Updates the simple gateway configuration doc with configuration for
Nilamdyuti Goswami [Thu, 2 Apr 2015 11:19:58 +0000 (16:49 +0530)]
doc: Updates the simple gateway configuration doc with configuration for
mod_proxy_fcgi instead of mod_fastcgi.

Fixes: #3299
Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
10 years agodoc: Replaces reference to mod_fastcgi with mod_proxy_fcgi in gateway
Nilamdyuti Goswami [Thu, 2 Apr 2015 11:14:38 +0000 (16:44 +0530)]
doc: Replaces reference to mod_fastcgi with mod_proxy_fcgi in gateway
installation doc.

Fixes: #3299
Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
10 years agoMerge pull request #4201 from tchaikov/xlist-iterator
Loic Dachary [Thu, 2 Apr 2015 10:49:30 +0000 (12:49 +0200)]
Merge pull request #4201 from tchaikov/xlist-iterator

xlist: add compare operator for iterator

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #4068 from dachary/wip-opensuse
Loic Dachary [Thu, 2 Apr 2015 09:32:09 +0000 (11:32 +0200)]
Merge pull request #4068 from dachary/wip-opensuse

tests: add OpenSUSE 13.2 dockerfile

Reviewed-by: Owen Synge <osynge@suse.com>
10 years agoMerge pull request #4221 from xiaoxichen/rbd_discard_skip
Josh Durgin [Wed, 1 Apr 2015 17:35:58 +0000 (10:35 -0700)]
Merge pull request #4221 from xiaoxichen/rbd_discard_skip

Add rbd_discard_skip_zeroing flag

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agoMerge pull request #4213 from xiaoxichen/wip-new-rocksdb
Sage Weil [Wed, 1 Apr 2015 17:05:03 +0000 (10:05 -0700)]
Merge pull request #4213 from xiaoxichen/wip-new-rocksdb

RocksDB configuration

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #4208 from dmitryya/ceph_argparse_improvement
Kefu Chai [Wed, 1 Apr 2015 13:38:55 +0000 (21:38 +0800)]
Merge pull request #4208 from dmitryya/ceph_argparse_improvement

ceph_argparse: Remove code duplication and generalize ceph_argparse_with* routines

Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agoAdd rbd_skip_partial_discard flag 4221/head
Xiaoxi Chen [Mon, 30 Mar 2015 11:56:59 +0000 (19:56 +0800)]
Add rbd_skip_partial_discard flag

If we want to discard a range of an object, we will zero(use fallocate
to punch a hole) the range now. In general this introduce some overhead(extra writes).

If the filesystem ontop of RBD holding lots of small files, this
behavior will bring big performance penalty.

Adding a flag that allow user to control if they want to zero the
range.

Signed-off-by: Xiaoxi Chen <xiaoxi.chen@intel.com>
10 years agoMerge pull request #4235 from ceph/wip-rbd-unit-tests
Josh Durgin [Tue, 31 Mar 2015 19:36:18 +0000 (12:36 -0700)]
Merge pull request #4235 from ceph/wip-rbd-unit-tests

tests: exercise all RBD features during unit testing

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agoMerge pull request #4232 from ceph/fix-make-conf
Josh Durgin [Tue, 31 Mar 2015 19:34:00 +0000 (12:34 -0700)]
Merge pull request #4232 from ceph/fix-make-conf

Fix make conf

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agoMerge pull request #4236 from ceph/wip-verify-mds-journal-makefile
Gregory Farnum [Tue, 31 Mar 2015 19:27:34 +0000 (12:27 -0700)]
Merge pull request #4236 from ceph/wip-verify-mds-journal-makefile

mds: update Makefile for removed script

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
10 years agomds: update Makefile for removed script 4236/head
John Spray [Tue, 31 Mar 2015 19:15:28 +0000 (20:15 +0100)]
mds: update Makefile for removed script

Oversight in "mds: remove verify-mds-journal.sh script"

Signed-off-by: John Spray <john.spray@redhat.com>
10 years agoceph_argparse: generalize ceph_argparse_with* routines 4208/head
Dmitry Yatsushkevich [Fri, 27 Mar 2015 22:34:24 +0000 (15:34 -0700)]
ceph_argparse: generalize ceph_argparse_with* routines

Remove code duplication by generalizing ceph_argparse_with{int,float,longlong}
routines - make one template function for those cases.

Signed-off-by: Dmitry Yatsushkevich <dyatsushkevich@mirantis.com>
10 years agorbd cli: remove erroneous arg for ceph_argparse_witharg
Dmitry Yatsushkevich [Wed, 25 Mar 2015 20:42:06 +0000 (13:42 -0700)]
rbd cli: remove erroneous arg for ceph_argparse_witharg

Remove erroneous arg for ceph_argparse_witharg call when '--io-pattern' parsed:
the name look up will point the compiler to bool ceph_argparse_witharg(
    std::vector<const char*> &args,
    std::vector<const char*>::iterator &i, std::string *ret, ...) when compiler
is resolving this function call. The &err argument will be wrongly interpreted
as a char * variable to be compared with the argument name pointed by i.

Signed-off-by: Dmitry Yatsushkevich <dyatsushkevich@mirantis.com>
10 years agotests: exercise all RBD features during unit test 4235/head
Jason Dillaman [Tue, 31 Mar 2015 18:28:54 +0000 (14:28 -0400)]
tests: exercise all RBD features during unit test

The librbd unit tests currently only test the old image format. Ensure
the new format and its possible features are also tested.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agomake: fix with_rbd guard 4232/head
Noah Watkins [Tue, 31 Mar 2015 17:46:10 +0000 (10:46 -0700)]
make: fix with_rbd guard

FileJournal needs stuff from blkdev.c in libcommon.

./.libs/libosd.a(libos_la-FileJournal.o): In function `FileJournal::_open_block_device()':
/home/nwatkins/src/ceph/src/os/FileJournal.cc:139: undefined reference to `get_block_device_size(int, long*)'
/home/nwatkins/src/ceph/src/os/FileJournal.cc:161: undefined reference to `block_device_support_discard(char const*)'
./.libs/libosd.a(libos_la-FileJournal.o): In function `FileJournal::do_discard(long, long)':
/home/nwatkins/src/ceph/src/os/FileJournal.cc:1587: undefined reference to `block_device_discard(int, long, long)'

Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
10 years agomake: add with_rbd guard
Noah Watkins [Tue, 31 Mar 2015 17:43:49 +0000 (10:43 -0700)]
make: add with_rbd guard

Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
10 years agoMerge pull request #4231 from ceph/wip-rm-verify-mds
Gregory Farnum [Tue, 31 Mar 2015 17:08:53 +0000 (10:08 -0700)]
Merge pull request #4231 from ceph/wip-rm-verify-mds

mds: remove verify-mds-journal.sh script

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
10 years agomds: remove verify-mds-journal.sh script 4231/head
John Spray [Tue, 31 Mar 2015 16:45:21 +0000 (17:45 +0100)]
mds: remove verify-mds-journal.sh script

This invokes the MDS in a way that it no longer understands,
and is unused.

Signed-off-by: John Spray <john.spray@redhat.com>
10 years agoMerge pull request #4211 from ceph/wip-11120
Gregory Farnum [Tue, 31 Mar 2015 16:26:04 +0000 (09:26 -0700)]
Merge pull request #4211 from ceph/wip-11120

osdc/Striper.cc fix stripe_count == 1 && stripe_unit != object_size

Reviewed-by: John Spray <jspray@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
10 years agoMerge pull request #4225 from Fale/patch-1
Kefu Chai [Tue, 31 Mar 2015 16:05:51 +0000 (00:05 +0800)]
Merge pull request #4225 from Fale/patch-1

doc: fix the architecture diagram in cephfs.rst

Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agodoc: fix the architecture diagram in cephfs.rst 4225/head
Fabio Alessandro Locati [Tue, 31 Mar 2015 08:33:59 +0000 (10:33 +0200)]
doc: fix the architecture diagram in cephfs.rst

Signed-off-by: Fabio Alessandro Locati <fabio@locati.cc>
10 years agoMerge pull request #4215 from ceph/wip-11258
John Spray [Tue, 31 Mar 2015 13:23:19 +0000 (14:23 +0100)]
Merge pull request #4215 from ceph/wip-11258

Wip 11258

Reviewed-by: John Spray <john.spray@redhat.com>
10 years agoSet disableDataSync to false 4213/head
Xiaoxi Chen [Mon, 30 Mar 2015 07:56:07 +0000 (15:56 +0800)]
Set disableDataSync to false

If datasync is disabled, we may potentially lose data
on power failure.

Signed-off-by: Xiaoxi Chen <xiaoxi.chen@intel.com>
10 years agoUpdate RocksDB configuration to make it more clear
Xiaoxi Chen [Fri, 27 Mar 2015 08:08:10 +0000 (16:08 +0800)]
Update RocksDB configuration to make it more clear

Add some performance critial configurations

Also group and polish the description of each configuration
to make it more clear, changed the default from 0 to actual
value.

Signed-off-by: Xiaoxi Chen <xiaoxi.chen@intel.com>
10 years agoMerge remote-tracking branch 'gh/hammer'
Sage Weil [Mon, 30 Mar 2015 22:41:13 +0000 (15:41 -0700)]
Merge remote-tracking branch 'gh/hammer'

Conflicts:
src/gmock
src/osd/ReplicatedPG.cc

10 years agolibrados: define C++ global flags from the C constants 4220/head
Josh Durgin [Mon, 30 Mar 2015 22:29:17 +0000 (15:29 -0700)]
librados: define C++ global flags from the C constants

This will help prevent drift in the future. It also makes it clear
that the flags are supposed to have the same values.

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
10 years agotest: add librados global op flags test
Josh Durgin [Mon, 30 Mar 2015 21:33:19 +0000 (14:33 -0700)]
test: add librados global op flags test

Just verify that the read gets the right data, to demonstrate that
passing a flag doesn't cause problems.

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
10 years agoos/KeyValueDB: skip experimental check for test_init
Sage Weil [Mon, 30 Mar 2015 22:12:55 +0000 (15:12 -0700)]
os/KeyValueDB: skip experimental check for test_init

We don't want to spit out the warning twice, and we don't have cct
anyway.

Also test_init is annoying; we should try to kill it.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoRevert "librados: remove the unused flags."
Josh Durgin [Mon, 30 Mar 2015 18:03:44 +0000 (11:03 -0700)]
Revert "librados: remove the unused flags."

This reverts commit 4bd2bd6bb89b70167de2f142008540238f682f6d.

These constants are the only way these flags are exposed through the C
interface. C users can't include librados.hpp.  Ideally we would have
only one version of these (just the C ones), but the C++ ones came
first and need to stay for backwards compatibility.

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
10 years agoMerge pull request #3878 from ceph/wip-dirty-pg-keys
Sage Weil [Mon, 30 Mar 2015 18:18:56 +0000 (11:18 -0700)]
Merge pull request #3878 from ceph/wip-dirty-pg-keys

osd: coalesce into single omap_setkeys for normal writes

Tested-by: Andreas Bluemle <andreas.bluemle@itxperts.de>
Reviewed-by: David Zafman <dzafman@redhat.com>
10 years agoMerge pull request #4212 from zhouyuan/isal_2.13
Loic Dachary [Mon, 30 Mar 2015 18:17:38 +0000 (20:17 +0200)]
Merge pull request #4212 from zhouyuan/isal_2.13

erasure-code: Update ISA-L to 2.13

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #4160 from ceph/wip-rocksdb
Sage Weil [Mon, 30 Mar 2015 17:57:07 +0000 (10:57 -0700)]
Merge pull request #4160 from ceph/wip-rocksdb

update rocksdb

10 years agomark kinetic experimental 4160/head
Sage Weil [Mon, 30 Mar 2015 16:33:16 +0000 (09:33 -0700)]
mark kinetic experimental

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agomark rocksdb experimental
Sage Weil [Mon, 30 Mar 2015 16:33:00 +0000 (09:33 -0700)]
mark rocksdb experimental

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #4131 from t-miyamae/wip-mshec-documentation-h2
Loic Dachary [Mon, 30 Mar 2015 12:37:08 +0000 (14:37 +0200)]
Merge pull request #4131 from t-miyamae/wip-mshec-documentation-h2

erasure code: add shec's documentation / change default layout

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agomds: fix out-of-order messages 4215/head
Yan, Zheng [Mon, 30 Mar 2015 09:35:59 +0000 (17:35 +0800)]
mds: fix out-of-order messages

When MDS is no longer laggy, it should process deferred messages
first, then process newly received messages.

Fix: #11258
Signed-off-by: Yan, Zheng <zyan@redhat.com>
10 years agoMerge pull request #4183 from stiopaa1/OSDMonTrailingSpaces
Kefu Chai [Mon, 30 Mar 2015 08:43:37 +0000 (16:43 +0800)]
Merge pull request #4183 from stiopaa1/OSDMonTrailingSpaces

mon/OSDMonitor: remove trailing whitespaces

Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agoerasure-code: Update ISA-L to 2.13 4212/head
Yuan Zhou [Mon, 30 Mar 2015 05:39:31 +0000 (13:39 +0800)]
erasure-code: Update ISA-L to 2.13

ISA-L 2.13 brings better performance on Avoton (20%). There's no impact on Xeon
platform. The details are in the release notes.

There's a new API ec_encode_data_update() for incremental encoding
and decoding. The other highlevel API keeps the same as in 2.10

Signed-off-by: Yuan Zhou <yuan.zhou@intel.com>
10 years agoosdc/Striper.cc fix stripe_count == 1 && stripe_unit != object_size 4211/head
Yan, Zheng [Mon, 30 Mar 2015 03:22:09 +0000 (11:22 +0800)]
osdc/Striper.cc fix stripe_count == 1 && stripe_unit != object_size

Fixes:11120
Signed-off-by: Yan, Zheng <zyan@redhat.com>
10 years agoMerge pull request #4209 from ceph/wip-java
Gregory Farnum [Sat, 28 Mar 2015 18:02:52 +0000 (11:02 -0700)]
Merge pull request #4209 from ceph/wip-java

fix rhel linking error

Backport: giant, firefly, dumpling

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
10 years agojava: libcephfs_jni.so is in /usr/lib64 on rhel 4209/head
Noah Watkins [Sat, 28 Mar 2015 02:34:12 +0000 (19:34 -0700)]
java: libcephfs_jni.so is in /usr/lib64 on rhel

Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
10 years agojava: dump extra info for ftruncate assertion
Noah Watkins [Sat, 28 Mar 2015 02:09:15 +0000 (19:09 -0700)]
java: dump extra info for ftruncate assertion

Nightly ran and encountered a situation in which fstat following
ftruncate reported a size not equal to the truncated size.

Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
10 years agoMerge pull request #4203 from Vicente-Cheng/fixed-get-mdsmap-assertion
Gregory Farnum [Fri, 27 Mar 2015 18:35:30 +0000 (11:35 -0700)]
Merge pull request #4203 from Vicente-Cheng/fixed-get-mdsmap-assertion

mds: fixed the ceph get mdsmap assertion.

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
10 years agoMerge pull request #4173 from ceph/wip-mds-kill-session
Gregory Farnum [Fri, 27 Mar 2015 18:29:19 +0000 (11:29 -0700)]
Merge pull request #4173 from ceph/wip-mds-kill-session

Wip mds kill session

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Reviewed-by: John Spray <jspray@redhat.com>
10 years agoMerge pull request #4168 from ceph/wip-11226-dir-fx
Gregory Farnum [Fri, 27 Mar 2015 18:28:31 +0000 (11:28 -0700)]
Merge pull request #4168 from ceph/wip-11226-dir-fx

RFC client: Hold on to exclusive caps on directories we "own"

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #4177 from ceph/wip-11226-extra
Gregory Farnum [Fri, 27 Mar 2015 18:27:58 +0000 (11:27 -0700)]
Merge pull request #4177 from ceph/wip-11226-extra

Wip 11226 extra

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
10 years agoMerge pull request #4189 from ceph/wip-11236
Gregory Farnum [Fri, 27 Mar 2015 18:26:21 +0000 (11:26 -0700)]
Merge pull request #4189 from ceph/wip-11236

test_libcephfs: do cleanup in ReleaseMounted test

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
10 years agoMerge pull request #4192 from ceph/wip-11218
Gregory Farnum [Fri, 27 Mar 2015 18:24:50 +0000 (11:24 -0700)]
Merge pull request #4192 from ceph/wip-11218

#11218: Multi-MDS fixes for 'damaged' ranks

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
10 years agoMerge pull request #4199 from ceph/wip-11250
Josh Durgin [Fri, 27 Mar 2015 15:51:19 +0000 (08:51 -0700)]
Merge pull request #4199 from ceph/wip-11250

cls_rbd: fix read past end of bufferlist c_str() in debug log msg

Reviewed-by: Haomai Wang <haomaiwang@gmail.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agoMerge pull request #4194 from athanatos/wip-11199
Sage Weil [Fri, 27 Mar 2015 15:15:29 +0000 (08:15 -0700)]
Merge pull request #4194 from athanatos/wip-11199

ReplicatedPG: trim backfill intervals based on peer's last_backfill_star...

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #4195 from athanatos/wip-11197
Sage Weil [Fri, 27 Mar 2015 15:10:20 +0000 (08:10 -0700)]
Merge pull request #4195 from athanatos/wip-11197

PG: set/clear CREATING in Primary state entry/exit

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #4200 from ceph/wip-mds-remove-inode
John Spray [Fri, 27 Mar 2015 11:33:07 +0000 (11:33 +0000)]
Merge pull request #4200 from ceph/wip-mds-remove-inode

mds: properly remove inode after purging stray

Reviewed-by: John Spray <john.spray@redhat.com>
10 years agoFixed the ceph get mdsmap assertion. 4203/head
Vicente Cheng [Fri, 27 Mar 2015 10:49:28 +0000 (18:49 +0800)]
Fixed the ceph get mdsmap assertion.

    When we want to get mdsmap, we try to get_version()
    and the return value err = 0 means success.

    The assert verified r == 0. r would not change in this flow.
    It always meet assert and lead mon failure.

    I think this verify should be:
        assert(err == 0)
    It will help to check return value of get_version().

If you have any questions, feel free to let me know.
Thanks!

Signed-off-by: Vicente Cheng <freeze.bilsted@gmail.com>
10 years agoMerge pull request #4193 from larkly/patch-docerror-erasure
Kefu Chai [Fri, 27 Mar 2015 10:31:16 +0000 (18:31 +0800)]
Merge pull request #4193 from larkly/patch-docerror-erasure

doc: Incomplete example in erasure-coded-pool.rst

Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agoxlist: add compare operator for iterator 4201/head
Kefu Chai [Fri, 27 Mar 2015 08:45:20 +0000 (16:45 +0800)]
xlist: add compare operator for iterator

* and add basic test cases for xlist

Signed-off-by: Kefu Chai <kchai@redhat.com>
10 years agomds: properly remove inode after purging stray 4200/head
Yan, Zheng [Fri, 27 Mar 2015 07:09:21 +0000 (15:09 +0800)]
mds: properly remove inode after purging stray

Signed-off-by: Yan, Zheng <zyan@redhat.com>
10 years agocls_rbd: fix read past end of bufferlist c_str() in debug log msg 4199/head
Sage Weil [Fri, 27 Mar 2015 04:00:00 +0000 (21:00 -0700)]
cls_rbd: fix read past end of bufferlist c_str() in debug log msg

Fixes: #11250
Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #4196 from athanatos/wip-move-code
Kefu Chai [Fri, 27 Mar 2015 02:24:22 +0000 (10:24 +0800)]
Merge pull request #4196 from athanatos/wip-move-code

osd: Wip move code

Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agoMerge pull request #4171 from majianpeng/cleanup
Sage Weil [Fri, 27 Mar 2015 00:45:20 +0000 (17:45 -0700)]
Merge pull request #4171 from majianpeng/cleanup

common: print hexadecimal for ghobject_t.generation.

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoDoc: Incomplete example in erasure-coded-pool.rst 4193/head
Bosse Klykken [Thu, 26 Mar 2015 14:34:31 +0000 (15:34 +0100)]
Doc: Incomplete example in erasure-coded-pool.rst

Signed-off-by: Bosse Klykken <larkly@gmail.com>
10 years agorocksdb: fix 32-bit build
Sage Weil [Thu, 26 Mar 2015 18:04:18 +0000 (11:04 -0700)]
rocksdb: fix 32-bit build

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoMakefile-rocksdb.am: update for latest rocks
Sage Weil [Thu, 26 Mar 2015 18:01:35 +0000 (11:01 -0700)]
Makefile-rocksdb.am: update for latest rocks

Lots of files changed here; rebuilt the list from scratch.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoosd/: Move ReplicatedBackend methods into ReplicatedBackend.cc 4196/head
Samuel Just [Thu, 26 Mar 2015 17:50:19 +0000 (10:50 -0700)]
osd/: Move ReplicatedBackend methods into ReplicatedBackend.cc

Signed-off-by: Samuel Just <sjust@redhat.com>
10 years agoReplicatedPG: remove unused C_OnPushCommit
Samuel Just [Thu, 26 Mar 2015 17:44:00 +0000 (10:44 -0700)]
ReplicatedPG: remove unused C_OnPushCommit

Signed-off-by: Samuel Just <sjust@redhat.com>
10 years agoMerge pull request #4113 from wonzhq/rbd-fix
Josh Durgin [Thu, 26 Mar 2015 17:06:37 +0000 (10:06 -0700)]
Merge pull request #4113 from wonzhq/rbd-fix

rbd: misc fixes

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agomds: include damaged in MDSMap::dump 4192/head
John Spray [Thu, 26 Mar 2015 15:48:17 +0000 (15:48 +0000)]
mds: include damaged in MDSMap::dump

Signed-off-by: John Spray <john.spray@redhat.com>
10 years agomds: update peer failure response to account for damaged
John Spray [Thu, 26 Mar 2015 12:52:36 +0000 (12:52 +0000)]
mds: update peer failure response to account for damaged

...by calling get_down_mds_set instead of get_failed_mds_set.

Also remove a redundant if(true) around this region.

Signed-off-by: John Spray <john.spray@redhat.com>
10 years agomds: add get_down_mds_set method
John Spray [Thu, 26 Mar 2015 12:45:45 +0000 (12:45 +0000)]
mds: add get_down_mds_set method

For places where we would like to treat failed
and damaged MDS ranks the same, like detecting
when someone has dropped offline.

Signed-off-by: John Spray <john.spray@redhat.com>
10 years agomds: account for 'damaged' in MDSMap::is_degraded
John Spray [Thu, 26 Mar 2015 12:51:30 +0000 (12:51 +0000)]
mds: account for 'damaged' in MDSMap::is_degraded

Fixes: #11218
Signed-off-by: John Spray <john.spray@redhat.com>
10 years agomds: clarify MDBalancer::send_heartbeat
John Spray [Thu, 26 Mar 2015 12:22:43 +0000 (12:22 +0000)]
mds: clarify MDBalancer::send_heartbeat

The initial is_degraded() check guarantees that
the 'in' set is equal to the 'up' set.  Later,
this calls get_mds_set and assigns it to a variable
called 'up'.

It's clearer to use get_up_mds_set into the variable
called up (this was confusing when debugging #11218
which was itself a result of is_degraded() ignoring
damaged ranks).

Signed-off-by: John Spray <john.spray@redhat.com>
10 years agotest_libcephfs: do cleanup in ReleaseMounted test 4189/head
Yan, Zheng [Thu, 26 Mar 2015 07:10:38 +0000 (15:10 +0800)]
test_libcephfs: do cleanup in ReleaseMounted test

Fixes: #11236
Signed-off-by: Yan, Zheng <zyan@redhat.com>
10 years agoMerge pull request #4188 from XinzeChi/wip-test-1
Loic Dachary [Thu, 26 Mar 2015 06:45:05 +0000 (07:45 +0100)]
Merge pull request #4188 from XinzeChi/wip-test-1

test: add compile-command for test_ceph_daemon.py

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agotest: add compile-command for test_ceph_daemon.py 4188/head
Xinze Chi [Thu, 26 Mar 2015 05:58:33 +0000 (13:58 +0800)]
test: add compile-command for test_ceph_daemon.py

Signed-off-by: Xinze Chi <xmdxcxz@gmail.com>
10 years agocommon: print hexadecimal for ghobject_t.generation & shard_id 4171/head
Jianpeng Ma [Thu, 26 Mar 2015 05:51:02 +0000 (13:51 +0800)]
common: print hexadecimal for ghobject_t.generation & shard_id

In filestore, it use hexadecimal for ghobject_t.generation &
shard_id. Make the same.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
10 years agomon/OSDMonitor: remove trailing whitespaces 4183/head
Michal Jarzabek [Wed, 25 Mar 2015 19:43:52 +0000 (19:43 +0000)]
mon/OSDMonitor: remove trailing whitespaces

Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
10 years agoMerge pull request #4181 from ceph/wip-rpm-systemd-conditional-syntax
Loic Dachary [Wed, 25 Mar 2015 20:40:22 +0000 (21:40 +0100)]
Merge pull request #4181 from ceph/wip-rpm-systemd-conditional-syntax

ceph.spec.in: fix _with_systemd conditional

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #4182 from ceph/wip-replicatedpg-signed
Gregory Farnum [Wed, 25 Mar 2015 20:39:04 +0000 (13:39 -0700)]
Merge pull request #4182 from ceph/wip-replicatedpg-signed

ReplicatedPG: fix a signed/unsigned comparison warning

Reviewed-by: Samuel Just <sjust@redhat.com>
10 years agoReplicatedPG: fix a signed/unsigned comparison warning 4182/head
Greg Farnum [Wed, 25 Mar 2015 19:03:38 +0000 (12:03 -0700)]
ReplicatedPG: fix a signed/unsigned comparison warning

This mismatch about whether pool IDs are signed or unsigned is
a persistent annoyance. I'm now casting the unsigned down to signed space
because apparently the OSD is using negative IDs for temporary object
namespaces.

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
10 years agoceph.spec.in: fix _with_systemd conditional 4181/head
Ken Dreyer [Wed, 25 Mar 2015 18:16:03 +0000 (12:16 -0600)]
ceph.spec.in: fix _with_systemd conditional

The RPM conditional needs a "?" in the event that it is not defined.

10 years agoclient: Hold on to exclusive caps on directories we "own" 4168/head
Greg Farnum [Tue, 24 Mar 2015 22:15:42 +0000 (15:15 -0700)]
client: Hold on to exclusive caps on directories we "own"

If a directory is complete, we *really* want to keep the exclusive cap
so that we don't end up needing to do MDS lookup requests on every cache
miss.

Fixes: #11226
Signed-off-by: Greg Farnum <gfarnum@redhat.com>
10 years agoosd: do not double-write log entries 3878/head
Sage Weil [Wed, 25 Mar 2015 17:34:45 +0000 (10:34 -0700)]
osd: do not double-write log entries

The pg_log.add() call already dirties the log such that the later
write_log() call will write it.  There is no need to encode it separately
here and then explicitly omap_setkeys() it.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoosd: combine info and log writes into single omap_setkeys
Sage Weil [Wed, 4 Mar 2015 23:51:20 +0000 (15:51 -0800)]
osd: combine info and log writes into single omap_setkeys

This saves a surprising amount of CPU.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoosd: pass map to write_info instead of txn
Sage Weil [Wed, 4 Mar 2015 23:16:27 +0000 (15:16 -0800)]
osd: pass map to write_info instead of txn

No real change yet.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoMerge remote-tracking branch 'gh/hammer'
Sage Weil [Wed, 25 Mar 2015 17:30:20 +0000 (10:30 -0700)]
Merge remote-tracking branch 'gh/hammer'

Conflicts:
src/gmock

10 years agoPG: set/clear CREATING in Primary state entry/exit 4195/head
Samuel Just [Tue, 24 Mar 2015 17:48:02 +0000 (10:48 -0700)]
PG: set/clear CREATING in Primary state entry/exit

Previously, we did not actually set it when we got a pg creation message from
the mon.  It would actually get set on the first start_peering_interval after
that point.  If we don't get that far, but do send a stat update to the mon, we
can end up with 11197.  Instead, let's just set it and clear it upon entry into
and exit from the Primary state.

Fixes: 11197
Signed-off-by: Samuel Just <sjust@redhat.com>