]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
9 years agorgw: ONLY improve code formatting in rgw_object_expirer_core.{cc,h}. 10330/head
Radoslaw Zarzynski [Fri, 15 Jul 2016 15:18:23 +0000 (17:18 +0200)]
rgw: ONLY improve code formatting in rgw_object_expirer_core.{cc,h}.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
9 years agorgw: fix skipping some objects to delete by RadosGW's object expirer.
Radoslaw Zarzynski [Fri, 15 Jul 2016 15:11:04 +0000 (17:11 +0200)]
rgw: fix skipping some objects to delete by RadosGW's object expirer.

Wei Qiaomiao has found that expired objects, which should be removed by
the object expirer of RadosGW, might be left unprocessed till next
restart of a RadosGW's instance. This happens when process_single_shard
method of RGWObjectExpirer class exhaust a time slot for a single round
and finishes without informing caller about the situation.

Fixes: http://tracker.ceph.com/issues/16705
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
9 years agorgw: fix trimming object expirer's hints.
Radoslaw Zarzynski [Fri, 15 Jul 2016 15:05:37 +0000 (17:05 +0200)]
rgw: fix trimming object expirer's hints.

Fixes: http://tracker.ceph.com/issues/16684
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
9 years agoMerge pull request #10306 from tchaikov/wip-no-mktemp-p
Kefu Chai [Fri, 15 Jul 2016 13:34:02 +0000 (21:34 +0800)]
Merge pull request #10306 from tchaikov/wip-no-mktemp-p

qa/workunits/cephtool/test.sh: s/TMPDIR/TEMP_DIR/

Reviewed-by: Haomai Wang <haomai@xsky.com>
9 years agoMerge pull request #9972 from ceph/objclass-perm
Kefu Chai [Fri, 15 Jul 2016 09:25:44 +0000 (17:25 +0800)]
Merge pull request #9972 from ceph/objclass-perm

osd: object class loading and execution permissions

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
9 years agoMerge pull request #9980 from gaowanlong/split_out_handle_pg_scrub
Kefu Chai [Fri, 15 Jul 2016 09:09:14 +0000 (17:09 +0800)]
Merge pull request #9980 from gaowanlong/split_out_handle_pg_scrub

osd: small cleanups

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #10126 from dx9/wip-fcntl-warns
Kefu Chai [Fri, 15 Jul 2016 09:05:15 +0000 (17:05 +0800)]
Merge pull request #10126 from dx9/wip-fcntl-warns

test/libcephfs: fix gcc sys/fcntl.h warnings

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #10166 from wjwithagen/wip-wjw-cmake-test_rados_tool.sh
Kefu Chai [Fri, 15 Jul 2016 09:03:59 +0000 (17:03 +0800)]
Merge pull request #10166 from wjwithagen/wip-wjw-cmake-test_rados_tool.sh

test_rados_tool.sh: Make script work under ctest

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #9782 from Ved-vampir/zlib_cleanup
Kefu Chai [Fri, 15 Jul 2016 09:03:38 +0000 (17:03 +0800)]
Merge pull request #9782 from Ved-vampir/zlib_cleanup

compressor: zlib compressor plugin  cleanup

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agotest: run_seed_to_range.sh: check existance of a directory using [ -d "$dir" ] 10306/head
Kefu Chai [Fri, 15 Jul 2016 08:38:23 +0000 (16:38 +0800)]
test: run_seed_to_range.sh: check existance of a directory using [ -d "$dir" ]

sadly, sh evalutes `[ -d ]` to true. as it takes "-d" as a non-empty
string as true.

this fixes following failure
```
2016-07-12T23:22:02.839 INFO:teuthology.orchestra.run.mira084.stderr:cp:
missing destination file operand after β€˜.’
2016-07-12T23:22:02.839 INFO:teuthology.orchestra.run.mira084.stderr:Try
'cp --help' for more information.
```
see
http://pulpito.ceph.com/kchai-2016-07-12_23:09:35-rados-wip-kefu-testing2---basic-mira/311334/

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoqa/workunits/cephtool/test.sh: s/TMPDIR/TEMP_DIR/
Kefu Chai [Fri, 15 Jul 2016 08:20:22 +0000 (16:20 +0800)]
qa/workunits/cephtool/test.sh: s/TMPDIR/TEMP_DIR/

this fixes the test failure of
```
2016-07-12T23:29:40.935
INFO:tasks.workunit.client.0.mira101.stderr:/home/ubuntu/cephtest/workunit.client.0/cephtool/test.sh:
line 153: /CEPH_WATCH_9445: Permission denied
```
see
http://pulpito.ceph.com/kchai-2016-07-12_23:09:35-rados-wip-kefu-testing2---basic-mira/311333/

it's a regression introduced by e5c262b

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoqa/workunits/cephtool/test.sh: use mktemp $TEMP_DIR/XXX instead
Kefu Chai [Fri, 15 Jul 2016 06:21:50 +0000 (14:21 +0800)]
qa/workunits/cephtool/test.sh: use mktemp $TEMP_DIR/XXX instead

mktemp -p is not supported on FreeBSD

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #10131 from badone/wip-peering-doc-fixes
Kefu Chai [Fri, 15 Jul 2016 04:15:55 +0000 (12:15 +0800)]
Merge pull request #10131 from badone/wip-peering-doc-fixes

doc: peering.rst, fix typo

Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #10292 from badone/wip-perf-counters-doc-fixes
Kefu Chai [Fri, 15 Jul 2016 04:13:19 +0000 (12:13 +0800)]
Merge pull request #10292 from badone/wip-perf-counters-doc-fixes

doc: perf_counters.rst fix trivial typo

Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #9491 from Yan-waller/yj-wip-fixbuildpushop
Yuri Weinstein [Thu, 14 Jul 2016 22:16:22 +0000 (15:16 -0700)]
Merge pull request #9491 from Yan-waller/yj-wip-fixbuildpushop

osd/ReplicatedBackend: add sanity check during build_push_op()

Reviewed-by: Haomai Wang <haomai@xsky.com>
9 years agoMerge pull request #9510 from renhwztetecs/renhw-wip-common
Yuri Weinstein [Thu, 14 Jul 2016 22:15:18 +0000 (15:15 -0700)]
Merge pull request #9510 from renhwztetecs/renhw-wip-common

common: unknown hash type of judgment modification

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #9729 from stiopaa1/common_workqueue_addMove
Yuri Weinstein [Thu, 14 Jul 2016 22:14:39 +0000 (15:14 -0700)]
Merge pull request #9729 from stiopaa1/common_workqueue_addMove

common/WorkQueue: add std move

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agoMerge pull request #9770 from tanghaodong25/submit-transaction-perfcounter
Yuri Weinstein [Thu, 14 Jul 2016 22:13:31 +0000 (15:13 -0700)]
Merge pull request #9770 from tanghaodong25/submit-transaction-perfcounter

kv/RocksDB: add perfcounter for submit_transaction_sync operation

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #10274 from yehudasa/wip-16665
Casey Bodley [Thu, 14 Jul 2016 21:06:11 +0000 (17:06 -0400)]
Merge pull request #10274 from yehudasa/wip-16665

rgw: collect skips a specific coroutine stack

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agoMerge pull request #10187 from dreamhost/wip-16618
Yehuda Sadeh [Thu, 14 Jul 2016 18:42:37 +0000 (11:42 -0700)]
Merge pull request #10187 from dreamhost/wip-16618

rgw: fix multi-delete query param parsing.

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoMerge pull request #10289 from jdurgin/wip-googletest-centos
Samuel Just [Thu, 14 Jul 2016 14:48:35 +0000 (07:48 -0700)]
Merge pull request #10289 from jdurgin/wip-googletest-centos

fix the rpm build for centos

Reviewed-by: Samuel Just <sjust@redhat.com>
9 years agoMerge pull request #10271 from linuxbox2/rgw-rename
Orit Wasserman [Thu, 14 Jul 2016 13:42:08 +0000 (15:42 +0200)]
Merge pull request #10271 from linuxbox2/rgw-rename

rgw_file: fix rename cases and unify unlink
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
9 years agoMerge pull request #8618 from linuxbox2/rgw-file-setattr
Orit Wasserman [Thu, 14 Jul 2016 13:16:03 +0000 (15:16 +0200)]
Merge pull request #8618 from linuxbox2/rgw-file-setattr

rgw: file setattr
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
9 years agorgw_file: implement rgw_setattr 8618/head
Matt Benjamin [Thu, 14 Apr 2016 23:18:37 +0000 (19:18 -0400)]
rgw_file: implement rgw_setattr

Introduce a new RGWSetattrs RGWOp descendant, to create or replace
sets of attrs on buckets or objects.

This version of the change uses the standard RGWRADOS::set_attrs op
(we want attribute changes to (e.g.) sync with other changes).

Previous versions of this changed incorrectly masked the values
of st->st_ino in RGWFileHandle::stat(), now fixed.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
9 years agoMerge pull request #10284 from linuxbox2/rgwfile_write_guard
Orit Wasserman [Thu, 14 Jul 2016 12:31:21 +0000 (14:31 +0200)]
Merge pull request #10284 from linuxbox2/rgwfile_write_guard

rgw_file: refuse partial, out-of-order writes
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
9 years agoMerge pull request #10258 from ukernel/wip-16655
Kefu Chai [Thu, 14 Jul 2016 12:26:32 +0000 (20:26 +0800)]
Merge pull request #10258 from ukernel/wip-16655

ceph-fuse: link to libtcmalloc or jemalloc

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #10168 from batrick/client-inode-des
John Spray [Thu, 14 Jul 2016 11:38:48 +0000 (12:38 +0100)]
Merge pull request #10168 from batrick/client-inode-des

client: move Inode specific cleanup to destructor

Reviewed-by: John Spray <john.spray@redhat.com>
9 years agoMerge pull request #10169 from batrick/client-inode-cons
John Spray [Thu, 14 Jul 2016 11:33:20 +0000 (12:33 +0100)]
Merge pull request #10169 from batrick/client-inode-cons

client: note order of member init in cons

Reviewed-by: John Spray <john.spray@redhat.com>
9 years agoMerge pull request #10265 from tchaikov/wip-ceph-fs-warnings
John Spray [Thu, 14 Jul 2016 11:20:59 +0000 (12:20 +0100)]
Merge pull request #10265 from tchaikov/wip-ceph-fs-warnings

include/ceph_fs.h: guard `#define CEPH_SETATTR_*` with #ifndef

Reviewed-by: John Spray <john.spray@redhat.com>
9 years agoMerge pull request #10142 from batrick/i16042
John Spray [Thu, 14 Jul 2016 11:19:16 +0000 (12:19 +0100)]
Merge pull request #10142 from batrick/i16042

mds: move Finisher to unlocked shutdown

Reviewed-by: John Spray <john.spray@redhat.com>
9 years agoMerge pull request #10176 from renhwztetecs/renhw-wip-mon-mds
John Spray [Thu, 14 Jul 2016 11:18:14 +0000 (12:18 +0100)]
Merge pull request #10176 from renhwztetecs/renhw-wip-mon-mds

mon/mds: add err info when load_metadata is abnormal

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
9 years agoMerge pull request #10192 from batrick/mon-minor
John Spray [Thu, 14 Jul 2016 10:56:42 +0000 (11:56 +0100)]
Merge pull request #10192 from batrick/mon-minor

mon: use clearer code structure

Reviewed-by: songbaisen <song.baisen@zte.com.cn>
9 years agoMerge pull request #10200 from renhwztetecs/renhw-wip-mds-journal
John Spray [Thu, 14 Jul 2016 10:55:22 +0000 (11:55 +0100)]
Merge pull request #10200 from renhwztetecs/renhw-wip-mds-journal

osdc/mds: fixup pos parameter in the journaler

Reviewed-by: John Spray <john.spray@redhat.com>
9 years agodoc: peering.rst, fix typo 10131/head
Brad Hubbard [Tue, 5 Jul 2016 04:51:33 +0000 (14:51 +1000)]
doc: peering.rst, fix typo

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
9 years agodoc: perf_counters.rst fix trivial typo 10292/head
Brad Hubbard [Thu, 14 Jul 2016 07:55:21 +0000 (17:55 +1000)]
doc: perf_counters.rst fix trivial typo

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
9 years agoMerge pull request #9933 from chhabaramesh/master
Kefu Chai [Thu, 14 Jul 2016 06:13:08 +0000 (14:13 +0800)]
Merge pull request #9933 from chhabaramesh/master

kv: In memory keyvalue db implementation

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Mark Nelson <mnelson@redhat.com>
9 years agoinstall-deps: Get the latest virtualenv in a temporary folder 10289/head
Oleh Prypin [Wed, 13 Jul 2016 22:06:51 +0000 (01:06 +0300)]
install-deps: Get the latest virtualenv in a temporary folder
to work around a bug in old virtualenv

Signed-off-by: Oleh Prypin <oleh@pryp.in>
9 years agogoogletest: avoid installing any pieces of it
Josh Durgin [Wed, 13 Jul 2016 22:18:50 +0000 (15:18 -0700)]
googletest: avoid installing any pieces of it

This makes rpmbuild happy.

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #10286 from ceph/wip_leftover_with_mds
Ali Maredia [Wed, 13 Jul 2016 18:44:28 +0000 (14:44 -0400)]
Merge pull request #10286 from ceph/wip_leftover_with_mds

Removes remaining reference to WITH_MDS

Reviewed-by: Ali Maredia <amaredia@redhat.com>
9 years agorgw: collect skips a specific coroutine stack 10274/head
Yehuda Sadeh [Wed, 13 Jul 2016 03:36:35 +0000 (20:36 -0700)]
rgw: collect skips a specific coroutine stack

Fixes: http://tracker.ceph.com/issues/16665
Instead of drain_all_but() that specifies number of stacks to leave behind,
added drain_all_but_stack() that has a specific stack specified. This is needed
so that we don't call wakeup() through lease_cr->go_down() on a cr stack that
was already collected.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoNot all references to WITH_MDS were removed (see PR #10186). This 10286/head
J. Eric Ivancich [Wed, 13 Jul 2016 18:36:37 +0000 (14:36 -0400)]
Not all references to WITH_MDS were removed (see PR #10186). This
removes the final one (dependency of vstart on ceph-mds).

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
9 years agoMerge pull request #10120 from oritwas/bz16412
Yehuda Sadeh [Wed, 13 Jul 2016 17:56:13 +0000 (10:56 -0700)]
Merge pull request #10120 from oritwas/bz16412

rgw: remove bucket index objects when deleting the bucket

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoMerge pull request #10161 from ceph/wip-dang-cmake
Kefu Chai [Wed, 13 Jul 2016 16:52:17 +0000 (00:52 +0800)]
Merge pull request #10161 from ceph/wip-dang-cmake

CMake - stop pip checking for updates

Reviewed-by: Loic Dachary <ldachary@redhat.com>
Reviewed-by: Ali Maredia <amaredia@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #10170 from ceph/wip-pg-log-errors-11
Samuel Just [Wed, 13 Jul 2016 16:46:16 +0000 (09:46 -0700)]
Merge pull request #10170 from ceph/wip-pg-log-errors-11

include write error codes in the pg log

Reviewed-by: Samuel Just <sjust@redhat.com>
9 years agoMerge branch 'googletest'
Josh Durgin [Wed, 13 Jul 2016 15:06:29 +0000 (08:06 -0700)]
Merge branch 'googletest'

Update Ceph to use Google Test

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoobjclass: implement 'osd class default list' 9972/head
Noah Watkins [Mon, 27 Jun 2016 01:10:22 +0000 (18:10 -0700)]
objclass: implement 'osd class default list'

Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
9 years agorgw_file: refuse partial, out-of-order writes 10284/head
Matt Benjamin [Wed, 13 Jul 2016 14:16:59 +0000 (10:16 -0400)]
rgw_file: refuse partial, out-of-order writes

A single file object may be opened only once per gateway
instance, and writes to that object must be complete, and in-order.
Enforce this.

If an invalid write is seen, deletes the current write transaction.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
9 years agoMerge pull request #10282 from ceph/wip-cmake-cxx-flags
Casey Bodley [Wed, 13 Jul 2016 13:56:05 +0000 (09:56 -0400)]
Merge pull request #10282 from ceph/wip-cmake-cxx-flags

cmake: fix the FTBFS introduced by dc8b3ba

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agocmake: fix the FTBFS introduced by dc8b3ba 10282/head
Kefu Chai [Wed, 13 Jul 2016 13:44:50 +0000 (21:44 +0800)]
cmake: fix the FTBFS introduced by dc8b3ba

the flags are not list

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #10279 from ceph/wip-cmake
Kefu Chai [Wed, 13 Jul 2016 13:31:27 +0000 (21:31 +0800)]
Merge pull request #10279 from ceph/wip-cmake

cmake changes

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agoMerge pull request #9784 from ceph/wip-ms-async-fixes
Haomai Wang [Wed, 13 Jul 2016 13:28:53 +0000 (21:28 +0800)]
Merge pull request #9784 from ceph/wip-ms-async-fixes

msg/async: connect authorizer fix + recv_buf size

Reviewed-by: Haomai Wang <haomai@xsky.com>
9 years agoMerge pull request #10276 from tchaikov/wip-doc-drop-i386
Kefu Chai [Wed, 13 Jul 2016 12:15:16 +0000 (20:15 +0800)]
Merge pull request #10276 from tchaikov/wip-doc-drop-i386

doc: remove i386 from minimal hardware recommendations

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
Reviewed-by: Vikhyat Umrao <vumrao@redhat.com>
9 years agoMerge pull request #10254 from dillaman/wip-16536
Mykola Golub [Wed, 13 Jul 2016 12:10:37 +0000 (15:10 +0300)]
Merge pull request #10254 from dillaman/wip-16536

rbd-mirror: include local pool id in resync throttle unique key

Reviewed-by: Ricardo Dias <rdias@suse.com>
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
9 years agoMerge pull request #10245 from jcsp/wip-mds-cache-warn
John Spray [Wed, 13 Jul 2016 12:09:51 +0000 (13:09 +0100)]
Merge pull request #10245 from jcsp/wip-mds-cache-warn

mds: add health warning for oversized cache

Reviewed-by: Yan, Zheng <zyan@redhat.com>
9 years agocmake: use CMAKE_CXX_STANDARD for enabling C++11 10279/head
Kefu Chai [Wed, 13 Jul 2016 09:43:12 +0000 (17:43 +0800)]
cmake: use CMAKE_CXX_STANDARD for enabling C++11

hope we can drop the crufts when moving to cmake 3.1+

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #10191 from batrick/mds-minor
John Spray [Wed, 13 Jul 2016 11:41:01 +0000 (12:41 +0100)]
Merge pull request #10191 from batrick/mds-minor

mds: use reference to avoid copy

Reviewed-by: John Spray <john.spray@redhat.com>
9 years agoMerge pull request #10268 from batrick/i16664
John Spray [Wed, 13 Jul 2016 11:33:01 +0000 (12:33 +0100)]
Merge pull request #10268 from batrick/i16664

doc: fix standby replay config

Reviewed-by: John Spray <john.spray@redhat.com>
9 years agocmake: do not check for availability of static_cast<> anymore
Kefu Chai [Wed, 13 Jul 2016 09:23:07 +0000 (17:23 +0800)]
cmake: do not check for availability of static_cast<> anymore

it's implied by C++11 compliance.

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: use CHECK_STRUCT_HAS_MEMBER for checking member variables in struct
Kefu Chai [Wed, 13 Jul 2016 09:13:12 +0000 (17:13 +0800)]
cmake: use CHECK_STRUCT_HAS_MEMBER for checking member variables in struct

we were using CHECK_CXX_SOURCE_COMPILES() for this purpose, which was a
little bit clumsy.

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agokv: In memory keyvalue db implementation 9933/head
Ramesh Chander [Mon, 13 Jun 2016 08:22:14 +0000 (01:22 -0700)]
kv: In memory keyvalue db implementation

Signed-off-by: Ramesh Chander <Ramesh.Chander@sandisk.com>
9 years agoceph-fuse: link to libtcmalloc or jemalloc 10258/head
Yan, Zheng [Tue, 12 Jul 2016 08:07:53 +0000 (16:07 +0800)]
ceph-fuse: link to libtcmalloc or jemalloc

Fixes: http://tracker.ceph.com/issues/16655
Signed-off-by: Yan, Zheng <zyan@redhat.com>
9 years agodoc: remove i386 from minimal hardware recommendations 10276/head
Kefu Chai [Wed, 13 Jul 2016 06:37:58 +0000 (14:37 +0800)]
doc: remove i386 from minimal hardware recommendations

as we don't build or test on i386 machines now. also, we don't build
i386 releases anymore. and regular users are on amd64 or arm.

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #10102 from liewegas/wip-mon-nosnap
Kefu Chai [Wed, 13 Jul 2016 06:27:40 +0000 (14:27 +0800)]
Merge pull request #10102 from liewegas/wip-mon-nosnap

mon/MonitorDBStore: do not use snapshot iterator; close on close

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Reviewed-by: Joao Eduardo Luis <joao@suse.de>
Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #10275 from ceph/wip-cmake
Kefu Chai [Wed, 13 Jul 2016 06:13:26 +0000 (14:13 +0800)]
Merge pull request #10275 from ceph/wip-cmake

cmake: disable -fvar-tracking-assignments for ceph_dencoder.cc

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
9 years agocmake: disable -fvar-tracking-assignments for ceph_dencoder.cc 10275/head
Kefu Chai [Wed, 13 Jul 2016 04:58:31 +0000 (12:58 +0800)]
cmake: disable -fvar-tracking-assignments for ceph_dencoder.cc

there are too many variables involved in main() of ceph_dencoder.cc, but
-fvar-tracking-assignments is enabled by default, when the compiler
finds that the number of variables exceeds the limit
"max-vartrack-size", it gives up, and tries again disabling this option.

this change avoids the recompilation of ceph_dencoder.cc and also silences
the warning of
```
/home/jenkins-build/build/workspace/ceph-pull-requests/src/test/encoding/ceph_dencoder.cc:
In function β€˜int main(int, const char**)’:
/home/jenkins-build/build/workspace/ceph-pull-requests/src/test/encoding/ceph_dencoder.cc:289:5:
note: variable tracking size limit exceeded with
-fvar-tracking-assignments, retrying without
 int main(int argc, const char **argv)
     ^
```

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #10113 from stiopaa1/msg_asyncmess_moveC_handle_reap
Haomai Wang [Wed, 13 Jul 2016 03:14:22 +0000 (11:14 +0800)]
Merge pull request #10113 from stiopaa1/msg_asyncmess_moveC_handle_reap

msg/AsyncMessenger: move C_handle_reap class to cc

Reviewed-by: Haomai Wang <haomai@xsky.com>
9 years agoMerge pull request #10183 from stiopaa1/msg_asyncmess_addConstToSetAddrUnknowns
Haomai Wang [Wed, 13 Jul 2016 03:13:22 +0000 (11:13 +0800)]
Merge pull request #10183 from stiopaa1/msg_asyncmess_addConstToSetAddrUnknowns

msg/Messenger: add const and override to function

Reviewed-by: Haomai Wang <haomai@xsky.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
9 years agoMerge pull request #10141 from stiopaa1/msg_asyncmess_removeUnneededCast
Haomai Wang [Wed, 13 Jul 2016 03:12:28 +0000 (11:12 +0800)]
Merge pull request #10141 from stiopaa1/msg_asyncmess_removeUnneededCast

msg/AsyncMessenger.cc: remove unneeded cast

Reviewed-by: Haomai Wang <haomai@xsky.com>
Reviewed-by: Kefu Chai <kefu@redhat.com>
9 years agoinclude/ceph_fs.h: guard `#define CEPH_SETATTR_*` with #ifndef 10265/head
Kefu Chai [Tue, 12 Jul 2016 16:31:52 +0000 (00:31 +0800)]
include/ceph_fs.h: guard `#define CEPH_SETATTR_*` with #ifndef

this silences the warnings like:

```
from
/srv/autobuild-ceph/gitbuilder.git/build/out~/ceph-11.0.0-513-gfe98b0b/src/java/native/libcephfs_jni.cc:33:
warning:
/srv/autobuild-ceph/gitbuilder.git/build/out~/ceph-11.0.0-513-gfe98b0b/src/include/ceph_fs.h:373:0:
"CEPH_SETATTR_MODE" redefined [enabled by default]
^
In file included from
/srv/autobuild-ceph/gitbuilder.git/build/out~/ceph-11.0.0-513-gfe98b0b/src/java/native/libcephfs_jni.cc:32:0:
/srv/autobuild-ceph/gitbuilder.git/build/out~/ceph-11.0.0-513-gfe98b0b/src/include/cephfs/libcephfs.h:106:0:
note: this is the location of the previous definition
^
```

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #10266 from tchaikov/wip-ceph-detect-init-py3
Kefu Chai [Wed, 13 Jul 2016 02:22:48 +0000 (10:22 +0800)]
Merge pull request #10266 from tchaikov/wip-ceph-detect-init-py3

ceph-detect-init: fix the py3 test

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agogoogletest: use ceph branch
Josh Durgin [Thu, 23 Jun 2016 00:54:33 +0000 (17:54 -0700)]
googletest: use ceph branch

Added the same functionality as the previous gtest/gmock branches -
.gitignore and not installing shared libs that we only want to
statically link to test programs.

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
9 years agoReplace gmock/gtest with googletest
Anirudha Bose [Sun, 15 May 2016 12:41:19 +0000 (18:11 +0530)]
Replace gmock/gtest with googletest

Google Mock has been absorbed into the Google Test project, and
is now available under the googletest repository.

Signed-off-by: Anirudha Bose <ani07nov@gmail.com>
9 years agorgw_file: fix rename cases and unify unlink 10271/head
Matt Benjamin [Tue, 12 Jul 2016 21:43:43 +0000 (17:43 -0400)]
rgw_file: fix rename cases and unify unlink

Rather ordinary rename cases failed in the unlink step.  Fix this,
unifying the unlink path while at it.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
9 years agodoc: fix standby replay config 10268/head
Patrick Donnelly [Tue, 12 Jul 2016 19:43:23 +0000 (15:43 -0400)]
doc: fix standby replay config

I tried using these settings in tests without success. The correct config names
are prefixed with "mds".

Fixes: http://tracker.ceph.com/issues/16664
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
9 years agoceph-detect-init: fix the py3 test 10266/head
Kefu Chai [Tue, 12 Jul 2016 16:47:49 +0000 (00:47 +0800)]
ceph-detect-init: fix the py3 test

the mock_open() does not support "for i in open()", and readline() and
readlines() support was added in py3.3 and py3.4 so for better backwards
compatibility, we should change the code being tested to use the plain
read() call.
and also use open(path) instead of open(path, 'rb') for simplicity,
otherwise we need to use bytestring for comparison and pass the same
parameters to mock.

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agotest: ceph-detect-init: fix the indent
Kefu Chai [Tue, 12 Jul 2016 17:02:14 +0000 (01:02 +0800)]
test: ceph-detect-init: fix the indent

this fixes the pep8 failure:
```
pep8 runtests: commands[0] | flake8 ceph_detect_init tests
tests/test_all.py:121:17: E128 continuation line under-indented for
visual indent
tests/test_all.py:125:17: E128 continuation line under-indented for
visual indent
tests/test_all.py:129:17: E128 continuation line under-indented for
visual indent
tests/test_all.py:133:17: E128 continuation line under-indented for
visual indent
```

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #10090 from yuyuyu101/wip-remove-async-lock
Haomai Wang [Tue, 12 Jul 2016 16:26:16 +0000 (00:26 +0800)]
Merge pull request #10090 from yuyuyu101/wip-remove-async-lock

msg/async: remove file event lock

Reviewed-by: Kefu Chai <kefu@redhat.com>
9 years agoceph_test_msgr: clean previous sent queue infos 10090/head
Haomai Wang [Thu, 7 Jul 2016 11:12:46 +0000 (19:12 +0800)]
ceph_test_msgr: clean previous sent queue infos

1. A -> B
2. goto standby
3. B mark down
4. A reconnect to B
5. got reset session and dispatch remote reset
6. because remote reset is executed in DispatchQueue, it will be delayed
7. A -> B successfully and begin to send message
8. assert because we found the first message is missing but it's reasonble

if policy.resetcheck is true

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agoceph_test_msgr: use ceph log infrastructure to output
Haomai Wang [Thu, 7 Jul 2016 06:59:51 +0000 (14:59 +0800)]
ceph_test_msgr: use ceph log infrastructure to output

because we want to get the right log sequence which mixes ceph logginer and
cerr. Otherwise, cerr output make the logs a little disordered.

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agomsg/async/AsyncConnection: make sure no STATE_WAIT -> STATE_STANDBY
Haomai Wang [Thu, 7 Jul 2016 06:51:03 +0000 (14:51 +0800)]
msg/async/AsyncConnection: make sure no STATE_WAIT -> STATE_STANDBY

Otherwise if message in queue, we will continue to reconnect right now,
it won't meet our expectation that we want our connect request delay

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agotest_msgr: add server_msgr cleanup
Haomai Wang [Tue, 5 Jul 2016 02:52:27 +0000 (10:52 +0800)]
test_msgr: add server_msgr cleanup

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agomsg/async/AsyncConnection: add REPLACING write status to indicate replacing
Haomai Wang [Mon, 4 Jul 2016 04:06:34 +0000 (12:06 +0800)]
msg/async/AsyncConnection: add REPLACING write status to indicate replacing

When replacing, we don't expect any AsyncConnection dispatch new event which
will cause thing chaos

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agomsg/async: hold lock avoid state changing
Haomai Wang [Sun, 3 Jul 2016 15:11:35 +0000 (23:11 +0800)]
msg/async: hold lock avoid state changing

Fixes: http://tracker.ceph.com/issues/16554
Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agotest_async_driver: accept new api changes
Haomai Wang [Sun, 3 Jul 2016 14:02:25 +0000 (22:02 +0800)]
test_async_driver: accept new api changes

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agomsg/async: dont delete time event when exchange eventcenter
Haomai Wang [Sat, 2 Jul 2016 06:04:23 +0000 (14:04 +0800)]
msg/async: dont delete time event when exchange eventcenter

When replacing and someone called mark_down, it will delete_time_event which
isn't allowed. Because we're exchaning EventCenter now!

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agomsg/async/AsyncConnection: simplify shutdown socket flow
Haomai Wang [Fri, 1 Jul 2016 15:44:46 +0000 (23:44 +0800)]
msg/async/AsyncConnection: simplify shutdown socket flow

Let cleanup resources things all in shutdown_socket

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agomsg/async: add assert to ensure create/delete file event within thread
Haomai Wang [Wed, 29 Jun 2016 06:09:00 +0000 (14:09 +0800)]
msg/async: add assert to ensure create/delete file event within thread

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agoEvent: remove file_lock
Haomai Wang [Tue, 8 Mar 2016 03:29:51 +0000 (11:29 +0800)]
Event: remove file_lock

Now all EventCenter will exists within one thread, it will let all file events
api changes without locks.

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agomsg/async/AsyncMessenger: make sure all connection cleanup handler finished
Haomai Wang [Thu, 30 Jun 2016 08:43:51 +0000 (16:43 +0800)]
msg/async/AsyncMessenger: make sure all connection cleanup handler finished

Fixes: http://tracker.ceph.com/issues/16552
Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agomsg/async: remove close socket line
Haomai Wang [Wed, 29 Jun 2016 09:22:20 +0000 (17:22 +0800)]
msg/async: remove close socket line

because if we are in STATE_CLOSED, fd must be -1

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agomsg/async: make sure worker started before let msgr ready
Haomai Wang [Wed, 29 Jun 2016 09:14:16 +0000 (17:14 +0800)]
msg/async: make sure worker started before let msgr ready

When we create event thread, it need a little time to enter event loop(like
calling set_owner), if caller is going to call create_file_event before event
thread enter event loop, it will trigger assert.

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agomsg/async: make EventCenter notify file event creating when set_owner
Haomai Wang [Wed, 29 Jun 2016 08:54:16 +0000 (16:54 +0800)]
msg/async: make EventCenter notify file event creating when set_owner

EventCenter::init is called by other thread instead of event thread, so we
need to move create_file_event to set_owner which is called by event thread.

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agomsg/async/AsyncConnection: swap eventcenter when replacing
Haomai Wang [Wed, 29 Jun 2016 08:26:29 +0000 (16:26 +0800)]
msg/async/AsyncConnection: swap eventcenter when replacing

Previously we only exchange fd when replacing, now we will introduce dpdk
plugin in the near future. It needs all fd used locally which not like
kernel socket shared by all cores.

So we need to add EventCenter swapping to let each socket is associated to
EventCenter.

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agoMerge pull request #10153 from tchaikov/wip-no-copy-plugins
Kefu Chai [Tue, 12 Jul 2016 15:43:24 +0000 (23:43 +0800)]
Merge pull request #10153 from tchaikov/wip-no-copy-plugins

test: test_{compression_plugin,async_compressor}: do not copy plugins

Reviewed-by: Haomai Wang <haomai@xsky.com>
9 years agomsg/async/Event: fix delete_time_event leak
Haomai Wang [Tue, 12 Jul 2016 15:37:43 +0000 (23:37 +0800)]
msg/async/Event: fix delete_time_event leak

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agoAsyncMessenger: make create/delete_file_event within event thread
Haomai Wang [Tue, 8 Mar 2016 05:59:50 +0000 (13:59 +0800)]
AsyncMessenger: make create/delete_file_event within event thread

We are make each AsyncConnection/AsyncMessenger only modify its file event
in event thread. So make sure create/delete_file_event aren't directly called.

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agoMerge pull request #10174 from theanalyst/test/rgw/multisite-cleanup
Casey Bodley [Tue, 12 Jul 2016 14:12:16 +0000 (10:12 -0400)]
Merge pull request #10174 from theanalyst/test/rgw/multisite-cleanup

rgw: test_multi.py avoid creating mds

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agoMerge pull request #10211 from oritwas/wip-rgw-fix-zone-modify
Casey Bodley [Tue, 12 Jul 2016 14:10:56 +0000 (10:10 -0400)]
Merge pull request #10211 from oritwas/wip-rgw-fix-zone-modify

rgw: remove unused realm from radosgw-admin zone modify

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agoMerge pull request #10256 from ceph/wip-kill-ceph_test_rados_api_tmap_migrate
John Spray [Tue, 12 Jul 2016 10:10:59 +0000 (11:10 +0100)]
Merge pull request #10256 from ceph/wip-kill-ceph_test_rados_api_tmap_migrate

test: remove ceph_test_rados_api_tmap_migrate

Reviewed-by: John Spray <john.spray@redhat.com>
9 years agoMerge pull request #10229 from badone/wip-libgmock_main.la-build-failures
Kefu Chai [Tue, 12 Jul 2016 08:25:37 +0000 (16:25 +0800)]
Merge pull request #10229 from badone/wip-libgmock_main.la-build-failures

makefile: change librgw_file_* as check_PROGRAMS

Reviewed-by: Kefu Chai <kchai@redhat.com>