]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
9 years agomon/PGMonitor: make pg refresh debug output more informative 8033/head
Sage Weil [Thu, 10 Mar 2016 19:30:56 +0000 (14:30 -0500)]
mon/PGMonitor: make pg refresh debug output more informative

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agomon/PGMap: drop unused nocreating flag for stat_pg_{add,sub}
Sage Weil [Thu, 10 Mar 2016 18:15:43 +0000 (13:15 -0500)]
mon/PGMap: drop unused nocreating flag for stat_pg_{add,sub}

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoosd: drop create events based on same_primary_since, not interval
Sage Weil [Thu, 10 Mar 2016 16:47:47 +0000 (11:47 -0500)]
osd: drop create events based on same_primary_since, not interval

Creates are resent when the primary changes, not the interval.
Ensure we don't drop something we shouldn't.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoosd: drop unused primary arg to handle_pg_peering_evt
Sage Weil [Thu, 10 Mar 2016 16:26:30 +0000 (11:26 -0500)]
osd: drop unused primary arg to handle_pg_peering_evt

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoosd: use handle_pg_peering_evt for pg creations
Sage Weil [Wed, 9 Mar 2016 22:17:12 +0000 (17:17 -0500)]
osd: use handle_pg_peering_evt for pg creations

This ensures we captures all of the PG resurrection logic.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoosd: drop unused from arg from handle_pg_peering_evt
Sage Weil [Wed, 9 Mar 2016 22:08:11 +0000 (17:08 -0500)]
osd: drop unused from arg from handle_pg_peering_evt

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoosd: only pass history to handle_pg_peering_evt
Sage Weil [Wed, 9 Mar 2016 21:58:39 +0000 (16:58 -0500)]
osd: only pass history to handle_pg_peering_evt

We were passing the whole pg_info, but we only need the
history.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #8003 from liewegas/wip-ceph-disk-doc
Zack Cerza [Wed, 9 Mar 2016 21:32:50 +0000 (14:32 -0700)]
Merge pull request #8003 from liewegas/wip-ceph-disk-doc

man/8/ceph-disk: fix formatting issue

9 years agoMerge pull request #7927 from oritwas/wip-rgw-fix-default
Sage Weil [Wed, 9 Mar 2016 21:13:16 +0000 (16:13 -0500)]
Merge pull request #7927 from oritwas/wip-rgw-fix-default

rgw: RGWZoneParams::create should not handle -EEXIST error

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoMerge remote-tracking branch 'gh/jewel'
Sage Weil [Wed, 9 Mar 2016 20:45:38 +0000 (15:45 -0500)]
Merge remote-tracking branch 'gh/jewel'

9 years agoMerge pull request #7768 from xinxinsh/wip-fix-zero
Sage Weil [Wed, 9 Mar 2016 20:05:28 +0000 (15:05 -0500)]
Merge pull request #7768 from xinxinsh/wip-fix-zero

osd: filestore: FALLOC_FL_PUNCH_HOLE must be used with FALLOC_FL_KEEP_SIZE

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #7844 from xiexingguo/xxg-wip-14922
Sage Weil [Wed, 9 Mar 2016 20:03:42 +0000 (15:03 -0500)]
Merge pull request #7844 from xiexingguo/xxg-wip-14922

osd: replicatedpg: break out loop if we encounter fatal error during do_pg_op()

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7864 from dillaman/wip-librados-aio-notify
Sage Weil [Wed, 9 Mar 2016 20:03:14 +0000 (15:03 -0500)]
Merge pull request #7864 from dillaman/wip-librados-aio-notify

librados: race condition on aio_notify completion handling

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #7928 from branch-predictor/bp-radostool-reduce-mem
Sage Weil [Wed, 9 Mar 2016 20:02:00 +0000 (15:02 -0500)]
Merge pull request #7928 from branch-predictor/bp-radostool-reduce-mem

tools/rados: reduce "rados put" memory usage by op_size

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #7967 from tchaikov/wip-si-cast-coverity
Sage Weil [Wed, 9 Mar 2016 20:01:31 +0000 (15:01 -0500)]
Merge pull request #7967 from tchaikov/wip-si-cast-coverity

common/strtol.cc: fix the coverity warnings

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
9 years agoMerge pull request #7948 from avnerbh/fix_avoid_enqueue_dup_code
Sage Weil [Wed, 9 Mar 2016 19:07:21 +0000 (14:07 -0500)]
Merge pull request #7948 from avnerbh/fix_avoid_enqueue_dup_code

msg: remove duplicated code - local_delivery will now call 'enqueue'

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
9 years agoMerge pull request #7890 from liewegas/wip-reweight
Sage Weil [Wed, 9 Mar 2016 19:06:30 +0000 (14:06 -0500)]
Merge pull request #7890 from liewegas/wip-reweight

mon: osd [test-]reweight-by-{pg,utilization} command updates

Reviewed-by: Samuel Just <sjust@redhat.com>
9 years agomon: remove range=100 from reweight-by-* commands 7890/head
Sage Weil [Wed, 9 Mar 2016 18:25:55 +0000 (13:25 -0500)]
mon: remove range=100 from reweight-by-* commands

Specifying the range makes it skip instead of error when you give
it a bad value.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoman/8/ceph-disk: fix formatting issue 8003/head
Sage Weil [Wed, 9 Mar 2016 17:30:23 +0000 (12:30 -0500)]
man/8/ceph-disk: fix formatting issue

ERROR: /srv/autobuild-ceph/gitbuilder.git/build/doc/man/8/ceph-disk.rst:39: Unexpected indentation.
WARNING: /srv/autobuild-ceph/gitbuilder.git/build/doc/man/8/ceph-disk.rst:40: Block quote ends without a blank line; unexpected unindent.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7847 from wido/mirroring-fixes
Kefu Chai [Wed, 9 Mar 2016 15:50:16 +0000 (23:50 +0800)]
Merge pull request #7847 from wido/mirroring-fixes

Updated scripts and documentation for mirrors

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoAdd script to test connectivity and availability of Ceph mirrors 7847/head
Wido den Hollander [Tue, 16 Feb 2016 10:37:43 +0000 (11:37 +0100)]
Add script to test connectivity and availability of Ceph mirrors

Signed-off-by: Wido den Hollander <wido@42on.com>
9 years agomirror: Add examle rsync daemon configuration
Wido den Hollander [Wed, 10 Feb 2016 08:01:24 +0000 (09:01 +0100)]
mirror: Add examle rsync daemon configuration

This can be used by mirrors to offer a rsync service to end-users

Signed-off-by: Wido den Hollander <wido@42on.com>
9 years agodoc: Updated docs with additional mirror information
Wido den Hollander [Mon, 8 Feb 2016 11:11:21 +0000 (12:11 +0100)]
doc: Updated docs with additional mirror information

Signed-off-by: Wido den Hollander <wido@42on.com>
9 years agoMerge pull request #7552 from dachary/wip-14669-key-management
Sage Weil [Wed, 9 Mar 2016 15:31:53 +0000 (10:31 -0500)]
Merge pull request #7552 from dachary/wip-14669-key-management

ceph-disk: key management support

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7995 from majianpeng/bluestore-dump-onode
Sage Weil [Wed, 9 Mar 2016 15:18:28 +0000 (10:18 -0500)]
Merge pull request #7995 from majianpeng/bluestore-dump-onode

osd: bluestore: allow _dump_onode dynamic accept log level

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoos/bluestore/BlueStore: Allow _dump_onode dynamic accept log level. 7995/head
Jianpeng Ma [Wed, 9 Mar 2016 15:03:27 +0000 (23:03 +0800)]
os/bluestore/BlueStore: Allow _dump_onode dynamic accept log level.

Make _dump_onode dynamic accept different log level in different case.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
9 years agoMerge pull request #7996 from majianpeng/bluestore-fullextent-overwrite
Sage Weil [Wed, 9 Mar 2016 15:13:43 +0000 (10:13 -0500)]
Merge pull request #7996 from majianpeng/bluestore-fullextent-overwrite

osd: bluestore: for overwrite a extent, allocate new extent on min_alloc_size write

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoos/bluestore/BlueStore: For overwrite a extent, allocate new extent rather than WAL. 7996/head
Jianpeng Ma [Wed, 9 Mar 2016 15:52:23 +0000 (23:52 +0800)]
os/bluestore/BlueStore: For overwrite a extent, allocate new extent rather than WAL.

This bug introduce by commit:b0b4b6de362f0edf. This commit forget this
case which overwrite(0, bluestore_min_alloc_size).
For this case it  need a new extent rather than WAL.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
9 years agoMerge pull request #7960 from SUSE/wip-docdev-mon
Loic Dachary [Wed, 9 Mar 2016 09:41:14 +0000 (16:41 +0700)]
Merge pull request #7960 from SUSE/wip-docdev-mon

doc/dev: continue writing Testing in the cloud chapter

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agodoc/dev: Continue writing Testing in the cloud chapter 7960/head
Nathan Cutler [Mon, 7 Mar 2016 17:03:08 +0000 (18:03 +0100)]
doc/dev: Continue writing Testing in the cloud chapter

Signed-off-by: Nathan Cutler <ncutler@suse.com>
9 years agoMerge pull request #7986 from liewegas/wip-xxhash
Josh Durgin [Tue, 8 Mar 2016 23:22:26 +0000 (15:22 -0800)]
Merge pull request #7986 from liewegas/wip-xxhash

xxhash: use clone of xxhash.git; add .gitignore

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoxxHash: add .gitignore for build artifacts 7986/head
Sage Weil [Tue, 8 Mar 2016 21:18:00 +0000 (16:18 -0500)]
xxHash: add .gitignore for build artifacts

Signed-off-by: Sage Weil <sage@redhat.com>
9 years ago.gitmodules: use github.com/ceph/xxHash clone
Sage Weil [Tue, 8 Mar 2016 21:04:31 +0000 (16:04 -0500)]
.gitmodules: use github.com/ceph/xxHash clone

This lets us add our own commits, if necessary.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agodoc/release-notes: v10.0.4
Sage Weil [Tue, 8 Mar 2016 16:37:12 +0000 (11:37 -0500)]
doc/release-notes: v10.0.4

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7966 from dachary/wip-release-notes
Sage Weil [Tue, 8 Mar 2016 16:33:52 +0000 (11:33 -0500)]
Merge pull request #7966 from dachary/wip-release-notes

release-notes: draft v10.0.4 release notes

9 years agoMerge pull request #7880 from SUSE/wip_keyring_permisions_for_mon_deamon_14950
Sage Weil [Tue, 8 Mar 2016 16:22:08 +0000 (11:22 -0500)]
Merge pull request #7880 from SUSE/wip_keyring_permisions_for_mon_deamon_14950

mon: fix keyring permissions

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7121 from efirs/ef_eversion_t_no_sprintf
Sage Weil [Tue, 8 Mar 2016 16:21:42 +0000 (11:21 -0500)]
Merge pull request #7121 from efirs/ef_eversion_t_no_sprintf

osd: Replace snprintf with faster implementation in eversion_t::get_key_name

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #7141 from jecluis/wip-mon-clockskew
Sage Weil [Tue, 8 Mar 2016 16:21:20 +0000 (11:21 -0500)]
Merge pull request #7141 from jecluis/wip-mon-clockskew

mon: make clock skew checks sane

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #7899 from liewegas/wip-osd-markdown
Sage Weil [Tue, 8 Mar 2016 16:20:54 +0000 (11:20 -0500)]
Merge pull request #7899 from liewegas/wip-osd-markdown

test/osd: Relax the timing intervals in osd-markdown.sh

9 years agoMerge pull request #7900 from liewegas/wip-bluefs-alignment
Sage Weil [Tue, 8 Mar 2016 16:20:43 +0000 (11:20 -0500)]
Merge pull request #7900 from liewegas/wip-bluefs-alignment

osd: bluefs: fix alignment for odd page sizes

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7904 from liewegas/wip-log-delete
Sage Weil [Tue, 8 Mar 2016 16:20:10 +0000 (11:20 -0500)]
Merge pull request #7904 from liewegas/wip-log-delete

log: use delete[]

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
9 years agoMerge pull request #7742 from ErwanAliasr1/evelu-spec
Ken Dreyer [Tue, 8 Mar 2016 13:51:31 +0000 (06:51 -0700)]
Merge pull request #7742 from ErwanAliasr1/evelu-spec

Adding build requires

Reviewed-by: Nathan Cutler <ncutler@suse.com>
Reviewed-by: Boris Ranto <branto@redhat.com>
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
9 years agocommon/strtol.cc: fix the coverity warnings 7967/head
Kefu Chai [Tue, 8 Mar 2016 05:01:13 +0000 (13:01 +0800)]
common/strtol.cc: fix the coverity warnings

* promote the compared types properly to address the signed/unsigned
  comparison warnings. this also fixes the potential problems of
  slicing a compared type down to a "smaller" type before the
  comparison.
* check for the width of resulting type and shift bits caused by SI
  prefix to avoid the -Wshift-count-overflow warnings. this again
  is a potential issue, as shifting n bits of an integer of m bits
  width, where n >= m, leads to undefined behaviour.
* add a test for the 2nd fixed issue.

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #7972 from badone/wip-CMakeLists-dup-line
Kefu Chai [Tue, 8 Mar 2016 11:31:25 +0000 (19:31 +0800)]
Merge pull request #7972 from badone/wip-CMakeLists-dup-line

cmake: Remove duplicate find_package libcurl line.

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoscripts: ceph-release-note rewrite PR title case 7966/head
Loic Dachary [Tue, 8 Mar 2016 04:22:04 +0000 (11:22 +0700)]
scripts: ceph-release-note rewrite PR title case

Signed-off-by: Loic Dachary <loic@dachary.org>
9 years agorelease-notes: draft v10.0.4 release notes
Loic Dachary [Tue, 8 Mar 2016 04:19:09 +0000 (11:19 +0700)]
release-notes: draft v10.0.4 release notes

Signed-off-by: Loic Dachary <loic@dachary.org>
9 years agoMerge pull request #7959 from kmroz/wip-add-rgw-to-stopsh
Sage Weil [Tue, 8 Mar 2016 02:04:01 +0000 (21:04 -0500)]
Merge pull request #7959 from kmroz/wip-add-rgw-to-stopsh

script: add missing stop_rgw variable to stop.sh script

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge branch 'master' of github.com:ceph/ceph
Sage Weil [Mon, 7 Mar 2016 20:58:44 +0000 (15:58 -0500)]
Merge branch 'master' of github.com:ceph/ceph

9 years agoMerge branch 'wip-conf-root' of https://github.com/liewegas/ceph
Sage Weil [Mon, 7 Mar 2016 20:36:13 +0000 (15:36 -0500)]
Merge branch 'wip-conf-root' of https://github.com/liewegas/ceph

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Conflicts:
src/common/config.cc

9 years agoMerge pull request #7914 from dillaman/wip-tests-template-specialization
Josh Durgin [Mon, 7 Mar 2016 20:07:51 +0000 (12:07 -0800)]
Merge pull request #7914 from dillaman/wip-tests-template-specialization

test: correct librbd errors discovered with unoptimized cmake build

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agopackaging: Moving Cython into distro specific area 7742/head
Erwan Velu [Fri, 26 Feb 2016 20:14:47 +0000 (21:14 +0100)]
packaging: Moving Cython into distro specific area

To get the spec file into a consistent state, let's move Cython into the distro
specific are of the spec file.

Signed-off-by: Erwan Velu <erwan@redhat.com>
9 years agopackaging: Adding redhat-rpm-config
Erwan Velu [Mon, 22 Feb 2016 14:11:41 +0000 (15:11 +0100)]
packaging: Adding redhat-rpm-config

Some part of the rados compilation process is expecting redhat-hardened-cc1.
That's surely because of the FORTIFY compilation flag.

redhat-hardened-cc1 is part of the redhat-rpm-config so let's put it as a build
dependency.

The typical output when this issue is occuring :

cd ./pybind/rados; CPPFLAGS="-iquote \/ceph/src/include -D__CEPH__ -D_FILE_OFFSET_BITS=64 -D_THREAD_SAFE -D__STDC_FORMAT_MACROS -D_GNU_SOURCE -DCEPH_LIBDIR=\"/usr/local/lib\" -DCEPH_PKGLIBDIR=\"/usr/local/lib/ceph\" -DGTEST_USE_OWN_TR1_TUPLE=0 -D_REENTRANT    " CFLAGS="-iquote \/ceph/src/include -Wall -Wtype-limits -Wignored-qualifiers -Winit-self -Wpointer-arith  -fno-strict-aliasing -fsigned-char -rdynamic -O2 -g -pipe -Wall -Wp,-U_FORTIFY_SOURCE -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -fPIE -fstack-protector-strong  -fno-builtin-malloc -fno-builtin-calloc -fno-builtin-realloc -fno-builtin-free  -g -O2" LDFLAGS="-L\/ceph/src/.libs -Wl,--as-needed  -Wl,-z,relro -Wl,-z,now  -latomic_ops " CYTHON_BUILD_DIR="/ceph/src/build" /bin/python ./setup.py build \
--build-base /ceph/src/build \
--verbose
Compiling rados.pyx because it changed.
Cythonizing rados.pyx
  CXXLD    libradosstriper.la
  CXXLD    librbd.la
  CXXLD    librgw.la
running build
running build_ext
building 'rados' extension
gcc -pthread -fno-strict-aliasing -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -m64 -mtune=generic -D_GNU_SOURCE -fPIC -fwrapv -DNDEBUG -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -m64 -mtune=generic -D_GNU_SOURCE -fPIC -fwrapv -iquote /ceph/src/include -Wall -Wtype-limits -Wignored-qualifiers -Winit-self -Wpointer-arith -fno-strict-aliasing -fsigned-char -rdynamic -O2 -g -pipe -Wall -Wp,-U_FORTIFY_SOURCE -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -fPIE -fstack-protector-strong -fno-builtin-malloc -fno-builtin-calloc -fno-builtin-realloc -fno-builtin-free -g -O2 -iquote /ceph/src/include -D__CEPH__ -D_FILE_OFFSET_BITS=64 -D_THREAD_SAFE -D__STDC_FORMAT_MACROS -D_GNU_SOURCE -DCEPH_LIBDIR=/usr/local/lib -DCEPH_PKGLIBDIR=/usr/local/lib/ceph -DGTEST_USE_OWN_TR1_TUPLE=0 -D_REENTRANT -fPIC -I/usr/include/python2.7 -c /ceph/src/build/rados.c -o /ceph/src/build/temp.linux-x86_64-2.7/ceph/src/build/rados.o
gcc: erreur: /usr/lib/rpm/redhat/redhat-hardened-cc1: Aucun fichier ou dossier de ce type
error: command 'gcc' failed with exit status 1

Signed-off-by: Erwan Velu <erwan@redhat.com>
9 years agopackaging: Adding btrfs build require
Erwan Velu [Mon, 22 Feb 2016 13:58:26 +0000 (14:58 +0100)]
packaging: Adding btrfs build require

When doing a 'make check', 'qa/workunits/ceph-helpers.sh' does expect the 'btrfs'
command to be available. If not, that make many tests failing.

Signed-off-by: Erwan Velu <erwan@redhat.com>
9 years agoMerge pull request #7628 from liewegas/wip-journal-block-size
Sage Weil [Mon, 7 Mar 2016 17:28:22 +0000 (12:28 -0500)]
Merge pull request #7628 from liewegas/wip-journal-block-size

os/filestore/FileJournal: set block size via config option

Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
9 years agoMerge pull request #7705 from renhwsky/renhw-wip-pgmonitor-get_rule_avail
Sage Weil [Mon, 7 Mar 2016 17:27:40 +0000 (12:27 -0500)]
Merge pull request #7705 from renhwsky/renhw-wip-pgmonitor-get_rule_avail

mon/pgmonitor: use appropriate forced conversions in get_rule_avail

9 years agoMerge pull request #7775 from branch-predictor/bp-bl-eradication
Sage Weil [Mon, 7 Mar 2016 17:27:07 +0000 (12:27 -0500)]
Merge pull request #7775 from branch-predictor/bp-bl-eradication

os/ObjectStore: implement more efficient get_encoded_bytes()

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7845 from aiicore/pthread_setname_fix
Sage Weil [Mon, 7 Mar 2016 17:25:13 +0000 (12:25 -0500)]
Merge pull request #7845 from aiicore/pthread_setname_fix

common: set thread name from correct thread

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7850 from jupiturliu/kstore-latency
Sage Weil [Mon, 7 Mar 2016 17:24:40 +0000 (12:24 -0500)]
Merge pull request #7850 from jupiturliu/kstore-latency

osd: kstore: latency breakdown

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7861 from tchaikov/wip-14910
Sage Weil [Mon, 7 Mar 2016 17:23:46 +0000 (12:23 -0500)]
Merge pull request #7861 from tchaikov/wip-14910

qa/workunits/cephtool/test.sh: wait longer in ceph_watch_start()

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7863 from branch-predictor/bp-faster-name-gen
Sage Weil [Mon, 7 Mar 2016 17:23:06 +0000 (12:23 -0500)]
Merge pull request #7863 from branch-predictor/bp-faster-name-gen

common/obj_bencher.cc: faster object name generation

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agostop: Add missing stop_rgw variable 7959/head
Karol Mroz [Mon, 7 Mar 2016 10:51:07 +0000 (11:51 +0100)]
stop: Add missing stop_rgw variable

Signed-off-by: Karol Mroz <kmroz@suse.com>
9 years agoMerge pull request #7954 from SUSE/wip-docdev
Loic Dachary [Mon, 7 Mar 2016 16:22:33 +0000 (23:22 +0700)]
Merge pull request #7954 from SUSE/wip-docdev

doc/dev: various refinements

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agodoc/dev: start Testing in the cloud chapter 7954/head
Nathan Cutler [Mon, 7 Mar 2016 11:04:39 +0000 (12:04 +0100)]
doc/dev: start Testing in the cloud chapter

Signed-off-by: Nathan Cutler <ncutler@suse.com>
9 years agodoc/dev: various refinements
Nathan Cutler [Mon, 7 Mar 2016 09:27:42 +0000 (10:27 +0100)]
doc/dev: various refinements

Signed-off-by: Nathan Cutler <ncutler@suse.com>
9 years agoMerge pull request #7951 from badone/wip-cls_hello-grammar
Kefu Chai [Mon, 7 Mar 2016 09:19:29 +0000 (17:19 +0800)]
Merge pull request #7951 from badone/wip-cls_hello-grammar

cls_hello: Fix grammatical error in description comment

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agotools/rados: reduce rados put memory usage by op_size 7928/head
Piotr Dałek [Fri, 4 Mar 2016 13:43:09 +0000 (14:43 +0100)]
tools/rados: reduce rados put memory usage by op_size

indata.append(char*, len) causes buffer "buf" to be physically copied
to new memory block. Make static buffer pointing to buf so we don't need
any intermediate copies. This reduces memory usage by op_size, and also
cpu usage by a bit (no memmove necessary).

Signed-off-by: Piotr Dałek <piotr.dalek@ts.fujitsu.com>
9 years agocmake: Remove duplicate find_package libcurl line. 7972/head
Brad Hubbard [Mon, 7 Mar 2016 02:24:51 +0000 (12:24 +1000)]
cmake: Remove duplicate find_package libcurl line.

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
9 years agoMerge pull request #7946 from SUSE/wip-doc-dev-teuth
Loic Dachary [Mon, 7 Mar 2016 03:12:28 +0000 (10:12 +0700)]
Merge pull request #7946 from SUSE/wip-doc-dev-teuth

doc/dev: integrate testing into the narrative

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agocls_hello: Fix grammatical error in description comment 7951/head
Brad Hubbard [Mon, 7 Mar 2016 02:30:11 +0000 (12:30 +1000)]
cls_hello: Fix grammatical error in description comment

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
9 years agodoc/dev: integrate testing into the narrative 7946/head
Nathan Cutler [Sat, 5 Mar 2016 21:48:41 +0000 (22:48 +0100)]
doc/dev: integrate testing into the narrative

Signed-off-by: Nathan Cutler <ncutler@suse.com>
9 years agomsg: remove duplicated code - local_delivery will now call 'enqueue' 7948/head
Avner BenHanoch [Sun, 6 Mar 2016 09:00:28 +0000 (11:00 +0200)]
msg: remove duplicated code - local_delivery will now call 'enqueue'

This simplify the code and clarify that for each local message,
 'local_delivery_thread' simply tries to 'fast_dispatch' it,
 or it will 'enqueue' it for the dispatch_thread (like any standard message)

Signed-off-by: Avner BenHanoch <avnerb@mellanox.com>
9 years agoMerge pull request #7862 from theanalyst/rgw/doc-insecure-keystone
Yehuda Sadeh [Sat, 5 Mar 2016 17:29:46 +0000 (09:29 -0800)]
Merge pull request #7862 from theanalyst/rgw/doc-insecure-keystone

doc: rgw explain keystone's verify ssl switch

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoMerge pull request #7887 from cbodley/wip-rgw-test-multi-period
Yehuda Sadeh [Sat, 5 Mar 2016 17:25:27 +0000 (09:25 -0800)]
Merge pull request #7887 from cbodley/wip-rgw-test-multi-period

test/rgw: add multisite test for meta sync across periods

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoMerge pull request #7827 from cbodley/wip-rgw-period-meta-logs
Yehuda Sadeh [Sat, 5 Mar 2016 17:25:01 +0000 (09:25 -0800)]
Merge pull request #7827 from cbodley/wip-rgw-period-meta-logs

rgw: fixes for per-period metadata logs

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoMerge pull request #7941 from SUSE/wip-teuos-intro
Loic Dachary [Sat, 5 Mar 2016 14:55:13 +0000 (21:55 +0700)]
Merge pull request #7941 from SUSE/wip-teuos-intro

doc: detailed description of bugfixing workflow

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agodoc: detailed description of bugfixing workflow 7941/head
Nathan Cutler [Sat, 5 Mar 2016 04:53:38 +0000 (05:53 +0100)]
doc: detailed description of bugfixing workflow

Signed-off-by: Nathan Cutler <ncutler@suse.com>
9 years agoMerge pull request #7933 from ceph/wip-doc-dist-ceph-detect-init
Loic Dachary [Sat, 5 Mar 2016 01:09:36 +0000 (08:09 +0700)]
Merge pull request #7933 from ceph/wip-doc-dist-ceph-detect-init

doc: add ceph-detect-init(8) source to dist tarball

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #7938 from dmick/jewel
Zack Cerza [Fri, 4 Mar 2016 23:19:30 +0000 (16:19 -0700)]
Merge pull request #7938 from dmick/jewel

debian/changelog: Remove stray 'v' in version

9 years agodebian/changelog: Remove stray 'v' in version 7938/head
Dan Mick [Fri, 4 Mar 2016 19:42:08 +0000 (11:42 -0800)]
debian/changelog: Remove stray 'v' in version

Signed-off-by: Dan Mick <dan.mick@redhat.com>
(cherry picked from commit 0f7730c8f444657d4aaffa28c12bbcd602a2e3b8)

9 years agoMerge pull request #7937 from saru95/patch--1
Josh Durgin [Fri, 4 Mar 2016 22:45:12 +0000 (14:45 -0800)]
Merge pull request #7937 from saru95/patch--1

ceph_daemon.py: Resolved ImportError to work with python3

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #7936 from ceph/wip-fix-debian-build
Zack Cerza [Fri, 4 Mar 2016 22:12:37 +0000 (15:12 -0700)]
Merge pull request #7936 from ceph/wip-fix-debian-build

debian/changelog: Remove stray 'v' in version

9 years agoceph_daemon.py: Resolved ImportError to work with python3 7937/head
Sarthak Munshi [Fri, 4 Mar 2016 21:25:17 +0000 (02:55 +0530)]
ceph_daemon.py: Resolved ImportError to work with python3

Signed-off-by: Sarthak Munshi <sarthakmunshi@gmail.com>
9 years agorgw: fix for RGWCoroutinesManager::run() return value 7827/head
Casey Bodley [Fri, 4 Mar 2016 20:22:50 +0000 (15:22 -0500)]
rgw: fix for RGWCoroutinesManager::run() return value

the 'int ret' variable of the inner scope was shadowing an 'int ret'
variable in the outer scope, so we weren't propagating any of the error
codes

Signed-off-by: Casey Bodley <cbodley@redhat.com>
9 years agorgw: use current period for InitSyncStatus
Casey Bodley [Fri, 26 Feb 2016 21:23:54 +0000 (16:23 -0500)]
rgw: use current period for InitSyncStatus

the InitSyncStatus coroutine records the position to start incremental
sync after finishing a full sync.  this should be the master's marker
from the current period, rather than its oldest log period

this also adds a check to run_sync() that restarts a full sync if it
sees that our sync period is behind the master's oldest log period

Signed-off-by: Casey Bodley <cbodley@redhat.com>
9 years agorgw: meta log rest handlers avoid get_log()
Casey Bodley [Fri, 26 Feb 2016 17:28:41 +0000 (12:28 -0500)]
rgw: meta log rest handlers avoid get_log()

RGWMetadataManager::get_log() will allocate a log and keep it in memory.
this could lead to a potential denial of service by making requests with
lots of different period ids

RGWMetadataLog if effectively stateless (the only state is a set of
modified_shards, which are not touched by any of the rest api calls), so
we can use a temporary instead of calling get_log()

Signed-off-by: Casey Bodley <cbodley@redhat.com>
9 years agorgw: pull first log period from master if not found locally
Casey Bodley [Thu, 25 Feb 2016 15:41:01 +0000 (10:41 -0500)]
rgw: pull first log period from master if not found locally

Signed-off-by: Casey Bodley <cbodley@redhat.com>
9 years agorgw: implement find_oldest_log_period for RGWMetadataManager
Casey Bodley [Thu, 25 Feb 2016 15:40:09 +0000 (10:40 -0500)]
rgw: implement find_oldest_log_period for RGWMetadataManager

Signed-off-by: Casey Bodley <cbodley@redhat.com>
9 years agorgw: period history behaves with no current_period
Casey Bodley [Tue, 23 Feb 2016 20:25:25 +0000 (15:25 -0500)]
rgw: period history behaves with no current_period

Signed-off-by: Casey Bodley <cbodley@redhat.com>
9 years agorgw: initialize async_rados before meta_mgr
Casey Bodley [Tue, 23 Feb 2016 18:08:15 +0000 (13:08 -0500)]
rgw: initialize async_rados before meta_mgr

RGWMetadataManager::init() will depend on async_rados

Signed-off-by: Casey Bodley <cbodley@redhat.com>
9 years agorgw: make RGWMetadataLog::get_shard_oid public and const
Casey Bodley [Tue, 23 Feb 2016 18:07:36 +0000 (13:07 -0500)]
rgw: make RGWMetadataLog::get_shard_oid public and const

Signed-off-by: Casey Bodley <cbodley@redhat.com>
9 years agorgw: add RGWStatObjCR for async raw_obj_stat
Casey Bodley [Mon, 22 Feb 2016 21:42:39 +0000 (16:42 -0500)]
rgw: add RGWStatObjCR for async raw_obj_stat

Signed-off-by: Casey Bodley <cbodley@redhat.com>
9 years agorgw: only write meta sync shard markers if can_adjust_marker
Casey Bodley [Fri, 19 Feb 2016 20:24:00 +0000 (15:24 -0500)]
rgw: only write meta sync shard markers if can_adjust_marker

Signed-off-by: Casey Bodley <cbodley@redhat.com>
9 years agorgw: make RGWMetaSyncCR wakeups thread-safe
Casey Bodley [Fri, 19 Feb 2016 20:09:41 +0000 (15:09 -0500)]
rgw: make RGWMetaSyncCR wakeups thread-safe

now that the shards will be coming and going after startup, they need to
be reference counted and protected by a mutex

Signed-off-by: Casey Bodley <cbodley@redhat.com>
9 years agorgw-admin: add read_current_period_id() helper function
Casey Bodley [Fri, 19 Feb 2016 19:19:24 +0000 (14:19 -0500)]
rgw-admin: add read_current_period_id() helper function

Signed-off-by: Casey Bodley <cbodley@redhat.com>
9 years agodebian/changelog: Remove stray 'v' in version 7936/head
Dan Mick [Fri, 4 Mar 2016 19:42:08 +0000 (11:42 -0800)]
debian/changelog: Remove stray 'v' in version

Signed-off-by: Dan Mick <dan.mick@redhat.com>
9 years agoMerge pull request #7918 from ceph/wip-rgw-payer-yehuda
Orit Wasserman [Fri, 4 Mar 2016 18:37:21 +0000 (19:37 +0100)]
Merge pull request #7918 from ceph/wip-rgw-payer-yehuda

rgw: link payer info to usage logging

Reviewed-by: Orit Wasserman <owasserm@redhat.com>
9 years agodoc: add ceph-detect-init(8) source to dist tarball 7933/head
Ken Dreyer [Fri, 4 Mar 2016 16:28:47 +0000 (09:28 -0700)]
doc: add ceph-detect-init(8) source to dist tarball

Prior to this commit, the tarball from "make dist" did not include the
ceph-detect-init(8) man page rST source.

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
9 years agoMerge pull request #7929 from yehudasa/wip-submodules-fix
Orit Wasserman [Fri, 4 Mar 2016 15:47:22 +0000 (16:47 +0100)]
Merge pull request #7929 from yehudasa/wip-submodules-fix

submodules: revert an accidental change

Reviewed-by: Orit Wasserman <owasserm@redhat.com>
9 years agoMerge pull request #7910 from ceph/wip-14955
Samuel Just [Fri, 4 Mar 2016 15:02:47 +0000 (07:02 -0800)]
Merge pull request #7910 from ceph/wip-14955

buffer: increment history alloc as well in raw_combined

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agosubmodules: revert an accidental change 7929/head
Yehuda Sadeh [Fri, 4 Mar 2016 14:54:49 +0000 (06:54 -0800)]
submodules: revert an accidental change

revert changes that went in in commit f1ac0de5bfd974258c257470feae5ff03054873e.
This affects ceph-erasure-code-corpus, civetweb

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>