Commit Graph

55877 Commits

Author SHA1 Message Date
Radoslaw Zarzynski
9697ca3414 rgw, doc: fix formatting around Keystone-related options.
This patch brings a small fix for broken formatting around
two configurables in doc/radosgw/config-ref.rst. Those are:
  * rgw keystone admin user,
  * rgw keystone admin password.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
2016-07-18 15:29:09 +02:00
Orit Wasserman
a01e32d128 Merge pull request #10271 from linuxbox2/rgw-rename
rgw_file: fix rename cases and unify unlink
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
2016-07-14 15:42:08 +02:00
Orit Wasserman
6a86bfe8b8 Merge pull request #8618 from linuxbox2/rgw-file-setattr
rgw: file setattr
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
2016-07-14 15:16:03 +02:00
Matt Benjamin
4de1c3c260 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>
2016-07-14 08:33:11 -04:00
Orit Wasserman
a0ffd6b1d3 Merge pull request #10284 from linuxbox2/rgwfile_write_guard
rgw_file: refuse partial, out-of-order writes
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
2016-07-14 14:31:21 +02:00
Kefu Chai
e5cf8c1a8f Merge pull request #10258 from ukernel/wip-16655
ceph-fuse: link to libtcmalloc or jemalloc

Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-07-14 20:26:32 +08:00
John Spray
f8ecf532fb Merge pull request #10168 from batrick/client-inode-des
client: move Inode specific cleanup to destructor

Reviewed-by: John Spray <john.spray@redhat.com>
2016-07-14 12:38:48 +01:00
John Spray
f8394a2a5c 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>
2016-07-14 12:33:20 +01:00
John Spray
ad86588abe 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>
2016-07-14 12:20:59 +01:00
John Spray
4b7a5cb2da Merge pull request #10142 from batrick/i16042
mds: move Finisher to unlocked shutdown

Reviewed-by: John Spray <john.spray@redhat.com>
2016-07-14 12:19:16 +01:00
John Spray
5195c94eb1 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>
2016-07-14 12:18:14 +01:00
John Spray
453b69f4ac Merge pull request #10192 from batrick/mon-minor
mon: use clearer code structure

Reviewed-by: songbaisen <song.baisen@zte.com.cn>
2016-07-14 11:56:42 +01:00
John Spray
b8c5647e56 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>
2016-07-14 11:55:22 +01:00
Kefu Chai
c5e5ef7179 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>
2016-07-14 14:13:08 +08:00
Ali Maredia
0f58056188 Merge pull request #10286 from ceph/wip_leftover_with_mds
Removes remaining reference to WITH_MDS

Reviewed-by: Ali Maredia <amaredia@redhat.com>
2016-07-13 14:44:28 -04:00
J. Eric Ivancich
d0baaae825 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>
2016-07-13 14:36:37 -04:00
Yehuda Sadeh
8912e0ef5b Merge pull request #10120 from oritwas/bz16412
rgw: remove bucket index objects when deleting the bucket

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2016-07-13 10:56:13 -07:00
Kefu Chai
b8c5cf0889 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>
2016-07-14 00:52:17 +08:00
Samuel Just
b4144fb329 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>
2016-07-13 09:46:16 -07:00
Josh Durgin
113efffa44 Merge branch 'googletest'
Update Ceph to use Google Test

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2016-07-13 08:06:29 -07:00
Matt Benjamin
12aded803e 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>
2016-07-13 10:40:03 -04:00
Casey Bodley
1af398f48b Merge pull request #10282 from ceph/wip-cmake-cxx-flags
cmake: fix the FTBFS introduced by dc8b3ba

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2016-07-13 09:56:05 -04:00
Kefu Chai
4b73cdc019 cmake: fix the FTBFS introduced by dc8b3ba
the flags are not list

Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-07-13 21:50:54 +08:00
Kefu Chai
d49ce27a74 Merge pull request #10279 from ceph/wip-cmake
cmake changes

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2016-07-13 21:31:27 +08:00
Haomai Wang
3fd4397115 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>
2016-07-13 21:28:53 +08:00
Kefu Chai
37df276db2 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>
2016-07-13 20:15:16 +08:00
Mykola Golub
c0422fa9fb 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>
2016-07-13 15:10:37 +03:00
John Spray
56a9aa7013 Merge pull request #10245 from jcsp/wip-mds-cache-warn
mds: add health warning for oversized cache

Reviewed-by: Yan, Zheng <zyan@redhat.com>
2016-07-13 13:09:51 +01:00
Kefu Chai
dc8b3bae5d 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>
2016-07-13 19:50:33 +08:00
John Spray
275b729336 Merge pull request #10191 from batrick/mds-minor
mds: use reference to avoid copy

Reviewed-by: John Spray <john.spray@redhat.com>
2016-07-13 12:41:01 +01:00
John Spray
44a4651bbd Merge pull request #10268 from batrick/i16664
doc: fix standby replay config

Reviewed-by: John Spray <john.spray@redhat.com>
2016-07-13 12:33:01 +01:00
Kefu Chai
2e7c72d8e8 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>
2016-07-13 17:23:11 +08:00
Kefu Chai
1a86184260 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>
2016-07-13 17:13:20 +08:00
Ramesh Chander
5460244e39 kv: In memory keyvalue db implementation
Signed-off-by: Ramesh Chander <Ramesh.Chander@sandisk.com>
2016-07-13 01:55:33 -07:00
Yan, Zheng
e644f6eb64 ceph-fuse: link to libtcmalloc or jemalloc
Fixes: http://tracker.ceph.com/issues/16655
Signed-off-by: Yan, Zheng <zyan@redhat.com>
2016-07-13 15:51:38 +08:00
Kefu Chai
2d5d479988 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>
2016-07-13 14:41:06 +08:00
Kefu Chai
fb3a34ba93 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>
2016-07-13 14:27:40 +08:00
Kefu Chai
898d25f892 Merge pull request #10275 from ceph/wip-cmake
cmake: disable -fvar-tracking-assignments for ceph_dencoder.cc

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
2016-07-13 14:13:26 +08:00
Kefu Chai
b6680516ea 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>
2016-07-13 12:58:33 +08:00
Haomai Wang
248637b184 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>
2016-07-13 11:14:22 +08:00
Haomai Wang
1143652f87 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>
2016-07-13 11:13:22 +08:00
Haomai Wang
1c987f8cfd 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>
2016-07-13 11:12:28 +08:00
Kefu Chai
5f3f33750d 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>
2016-07-13 10:37:30 +08:00
Kefu Chai
ec8d3bed93 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>
2016-07-13 10:22:48 +08:00
Josh Durgin
e6661736cb 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>
2016-07-12 17:18:09 -07:00
Anirudha Bose
a54a195dc4 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>
2016-07-12 17:18:09 -07:00
Matt Benjamin
05af1fbb87 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>
2016-07-12 17:43:43 -04:00
Patrick Donnelly
42e02369f0
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>
2016-07-12 15:44:00 -04:00
Kefu Chai
6ed1c41fed 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>
2016-07-13 02:25:07 +08:00
Kefu Chai
4366145a09 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>
2016-07-13 02:22:15 +08:00