Commit Graph

55211 Commits

Author SHA1 Message Date
Haomai Wang
d8cc985fe0 msg/async/AsyncConnection: lower racing case debug log level
Signed-off-by: Haomai Wang <haomai@xsky.com>
2016-06-20 02:17:49 +08:00
Michal Jarzabek
f428c2b594 mds/SessionMap.h: add const to member functions
Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
2016-06-19 14:25:36 +01:00
Michal Jarzabek
44da9f38f5 mds/SessionMap.h: remove duplicated line
Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
2016-06-19 14:25:36 +01:00
root
17d2c1712a rgw: Do not bother to check against conf values during quota handling
Signed-off-by: Pavan Rallabhandi <PRallabhandi@walmartlabs.com>
2016-06-19 13:10:50 +05:30
root
400d7c982f rgw: Let the default quota settings take effect during user creation
Signed-off-by: Pavan Rallabhandi <PRallabhandi@walmartlabs.com>
2016-06-19 13:10:49 +05:30
Michal Jarzabek
4623d2e72f msg/msg_types.h: make members private in ...
... entity_name_t class.

Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
2016-06-19 08:08:40 +01:00
Sage Weil
ee5c9f63f2 Merge pull request #9778 from ifed01/wip-bluestore-blob-reduce
os/bluestore: reduce bluestore blob

Reviewed-by: Sage Weil <sage@redhat.com>
2016-06-18 12:48:22 -04:00
Sage Weil
f29473b961 Merge pull request #9750 from ifed01/wip-bluestore-csum-output-fix
os/bluestore: fix improper blob's csum visualization.

Reviewed-by: Sage Weil <sage@redhat.com>
2016-06-18 12:48:01 -04:00
Sage Weil
636152c00d Merge pull request #9756 from liewegas/wip-bluestore-diet
os/bluestore: remove unused bluestore fields

Reviewed-by: Allen Samuels <allen.samuels@sandisk.com>
2016-06-18 12:47:43 -04:00
Kefu Chai
f369f4d585 debian: move libcephfs-jni to section "java"
Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-06-18 23:55:00 +08:00
Kefu Chai
62d4aab325 debian: remove X-Python-Version section
it's obsolete and can be removed now,
see
https://www.debian.org/doc/packaging-manuals/python-policy/ch-module_packages.html#s-specifying_versions

Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-06-18 23:55:00 +08:00
Kefu Chai
2454bda3f3 debian: add ${shlibs:Depends} to binary packages' Depends
rationale
* this fixes:
  warning: dpkg-gencontrol: package python-rbd: unused substitution
  variable ${shlibs:Depends}
* and to comply to debian policy. see
  https://www.debian.org/doc/debian-policy/ch-sharedlibs.html#s-dpkg-shlibdeps

Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-06-18 23:54:59 +08:00
Kefu Chai
e00610a50f debian: add jh_depends for ${java:Depends}
this fixes:
warning: dpkg-gencontrol: Depends field of package libcephfs-java:
unknown substitution variable ${java:Depends}

Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-06-18 23:54:59 +08:00
Kefu Chai
2882f9dd01 makefile: add librgw_file_* as noninst_PROGRAMS
Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-06-18 23:54:59 +08:00
Kefu Chai
a21071d1ba Merge pull request #9119 from runsisi/wip-fix-cmake-desc
cmake: update description for cmake module Findkeyutils.cmake

Reviewed-by: Ali Maredia <amaredia@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-06-18 23:51:41 +08:00
Kefu Chai
71bf392aae Merge pull request #9799 from stiopaa1/common_address_helper_changeScope
common/address_helper.cc:move variables closer...

Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-06-18 22:28:06 +08:00
Casey Bodley
69c52cfe2f Merge pull request #9797 from Yan-waller/yj-wip-rgwcompiling
rgw: kill compiling warning

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2016-06-18 10:21:13 -04:00
Michal Jarzabek
e86679d561 common/address_helper.cc:move variables closer...
... to the point where they are first used.

Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
2016-06-18 13:15:42 +01:00
Yan Jun
4e5b3de028 rgw: kill compiling warning
test/rgw/test_http_manager.cc: In member function ‘virtual void HTTPManager_SignalThread_Test::TestBody()’:
test/rgw/test_http_manager.cc:40:23: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
   for (int i = 0; i < num_requests; i++) {
                       ^

Signed-off-by: Yan Jun <yan.jun8@zte.com.cn>
2016-06-18 15:54:55 +08:00
Yibo Cai
0cdee4bf0a common: Improve linux dcache hash algorithm
In ceph_str_hash_linux(), hash value is defined as unsigned long,
which is 8 bytes on 64-bit platforms when compiled with gcc. But
the return value is truncated to 4 bytes, and there's no need to
preserve 8 bytes intermediate value in the algorithm. The compiler
doesn't figure out this fact and produces redundant code.

After removing the "long" definition, this route runs much faster.
Following result are tested on x86_64 and aarch64 platforms, built
by gcc 5.3.1 with optimization level -O2. Same output is observed
with gcc 4.8.4 and -O3 optimization.

ARM Cortex-A57
+---------------+--------------+---------------+-------------+
| String Length | Time w/ long | Time w/o long | Improvement |
+---------------+--------------+---------------+-------------+
| 32            | 0.088 us     | 0.067 us      | 24%         |
+---------------+--------------+---------------+-------------+
| 4096          | 10.26 us     | 8.20 us       | 20%         |
+---------------+--------------+---------------+-------------+
| 65536         | 164 us       | 131 us        | 20%         |
+---------------+--------------+---------------+-------------+
| 1048576       | 2624 us      | 2099 us       | 20%         |
+---------------+--------------+---------------+-------------+

Intel i7-4790
+---------------+--------------+---------------+-------------+
| String Length | Time w/ long | Time w/o long | Improvement |
+---------------+--------------+---------------+-------------+
| 32            | 0.033 us     | 0.028 us      | 16.3%       |
+---------------+--------------+---------------+-------------+
| 4096          | 3.87 us      | 3.64 us       | 6.2%        |
+---------------+--------------+---------------+-------------+
| 65536         | 61.3 us      | 57.8 us       | 5.7%        |
+---------------+--------------+---------------+-------------+
| 1048576       | 973 us       | 917 us        | 5.8%        |
+---------------+--------------+---------------+-------------+

Signed-off-by: Yibo Cai <yibo.cai@linaro.org>
2016-06-18 14:55:11 +08:00
xie xingguo
314005a730 ceph-fs: kill the public ceph_file_layout_is_valid() method
Which is deprecated file_layout_t::is_valid(), and removing
the unnecessary code is always the preferred option.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-06-18 09:54:57 +08:00
xie xingguo
35c54dc15d server: check cmode in the default bitwise way
Which better matches its definiton.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-06-18 09:54:57 +08:00
vasukulkarni
dbb0a59c88 Merge pull request #9764 from vasukulkarni/master
mention change of owner for /var/log/ceph
2016-06-17 15:41:17 -07:00
Samuel Just
60052a677a Merge pull request #9599 from sdieffen/feature15904
added -f flag for formatting to rados command line tool

Reviewed-by: Samuel Just <sjust@redhat.com>
2016-06-17 14:46:11 -07:00
Orit Wasserman
4b85e312f3 Merge pull request #9785 from cbodley/wip-rgw-httpmgr-select
rgw: fix deadlock in RGWHTTPManager when HAVE_CURL_MULTI_WAIT=0
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
2016-06-17 20:54:02 +02:00
Ali Maredia
a5c9775ac9 Merge pull request #9765 from dx9/wip-run-cmake
cmake: add arguments to cmake invocation to support cache configuration

Reviewed-by: Ali Maredia <amaredia@redhat.com>
2016-06-17 14:11:24 -04:00
Ali Maredia
435d2ee171 Merge pull request #9634 from ceph/cmake-git-rev
Update git rev parsing in CMake

Reviewed-by: Ali Maredia <amaredia@redhat.com>
2016-06-17 13:57:28 -04:00
Ali Maredia
b227712453 Merge pull request #9601 from ceph/wip-cmake
cmake: add ceph_test_* used by qa units and ceph-qa-suite tasks

Reviewed-by: Ali Maredia <amaredia@redhat.com>
2016-06-17 13:51:03 -04:00
Patrick Donnelly
ef27273121
mds: improve comments for ENOTEMPTY checks
There are two checks in the code for ENOTEMPTY, clarify that the first check is
doing a fast check without locks.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2016-06-17 13:48:25 -04:00
Orit Wasserman
b09fd37b7a Merge pull request #9725 from SUSE/wip-16327
rgw: check for -ERR_NOT_MODIFIED in rgw_rest_s3.cc
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
2016-06-17 19:25:24 +02:00
Casey Bodley
75897f82ab rgw: add pipe fd to set for select() in do_curl_wait()
when HAVE_CURL_MULTI_WAIT is 0, the pipe fd is never added to the
readfds for select(), so FD_ISSET() is always false. this prevents us
from ever trying to read from the fd, and the pipe's buffer eventually
fills up and deadlocks callers of RGWHTTPManager::signal_thread() when
they try to write to the pipe

Fixes: http://tracker.ceph.com/issues/16368

Signed-off-by: Casey Bodley <cbodley@redhat.com>
2016-06-17 12:37:42 -04:00
Casey Bodley
b8b339c10a test/rgw: add unit test for HTTPManager
unit test to detect a deadlock in RGWHTTPManager::signal_thread() when
HAVE_CURL_MULTI_WAIT=0

Signed-off-by: Casey Bodley <cbodley@redhat.com>
2016-06-17 12:32:27 -04:00
Casey Bodley
181477e377 Merge pull request #9779 from smanjara/wip-zone-rename
rgw: added zone rename to radosgw_admin

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2016-06-17 11:58:50 -04:00
Jason Dillaman
9687e5e34a librbd: journal callback to interrupt replay
If the exclusive lock is lost while the journal is in the
replay state, the journal close will block until the replay
completes. The new callback will facilitate stopping replay
in a timely fashion so that the journal can be closed.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-06-17 11:43:46 -04:00
Jason Dillaman
47e25e59a8 rbd-mirror: keep local pointer to image journal
Fixes: http://tracker.ceph.com/issues/16230
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-06-17 11:43:45 -04:00
Orit Wasserman
b368af69c0 Merge pull request #9686 from weiqiaomiao/wqm-wip-rgw-output
rgw: remove unnecessary output
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
2016-06-17 17:32:09 +02:00
Orit Wasserman
8b53525023 Merge pull request #9687 from theanalyst/rgw/orphans-find-msg
rgw-admin: don't print on ENOENT for orphans find
Reviewed-by" Orit Wasserman <owasserm@redhat.com>
2016-06-17 17:30:29 +02:00
Samuel Just
bdf4a93ed5 Merge pull request #9736 from tchaikov/wip-test-timeout
test: disable dup test for mds respawn cmd

Reviewed-by: Samuel Just <sjust@redhat.com>
2016-06-17 08:08:45 -07:00
Haomai Wang
43042c6435 Merge pull request #9086 from ceph/wip-15849
msg/async/AsyncConnection: create writable event for in progress connection
2016-06-17 22:29:55 +08:00
Sage Weil
c4d6359dbd Merge pull request #9461 from liewegas/wip-msgr2
doc: msgr2 protocol spec
2016-06-17 10:26:56 -04:00
Sage Weil
dd99adf58b Merge pull request #8963 from yuyuyu101/wip-15758
msg/async: Separated nonfast message and fast dispatch message thread

Reviewed-by: Sage Weil <sage@redhat.com>
2016-06-17 10:24:59 -04:00
Igor Fedotov
6a71e01812 os/bluestore: change bluestore_extent_ref_map_t key value(i.e. offset) from 64 to 32 bits.
Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>
2016-06-17 16:14:47 +03:00
Igor Fedotov
c2fa9a36a7 os/bluestore: remove bluestore_blob_t::length field
Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>
2016-06-17 16:14:36 +03:00
Shilpa Jagannath
da3235234e rgw: added zone rename to radosgw_admin
Added zone rename option to radosgw-admin help

Signed-off-by: Shilpa Jagannath <smanjara@redhat.com>
2016-06-17 18:29:42 +05:30
Mykola Golub
85e26eac0c Merge pull request #9759 from dillaman/wip-16352
rbd-mirror: ensure replay status formatter has completed before stopping

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
2016-06-17 14:15:56 +03:00
Mykola Golub
bd7ed8765d Merge pull request #9730 from dillaman/wip-16329
rbd-mirror: gracefully handle missing sync point snapshots

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
2016-06-17 14:15:16 +03:00
Mykola Golub
088b1f2cff Merge pull request #9751 from dillaman/wip-16348
librbd: unable to disable journaling feature if in unexpected mirror state

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
2016-06-17 14:14:50 +03:00
Kefu Chai
50ab0ea114 Merge pull request #8749 from Aran85/wip-check-failure-grace
mon/osdmonitor: decouple adjust_heartbeat_grace and min_down_reporters

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-06-17 19:02:17 +08:00
Kefu Chai
c4f8b132d6 Merge pull request #8827 from majianpeng/ceph-tell-osd
osd/OSD: make 'ceph tell osd.x get_command_descriptions' work.

Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-06-17 18:53:40 +08:00
Kefu Chai
733315663f Merge pull request #9056 from stiopaa1/osd_pistate_localstruct
osd/OSD.cc: make pistate a local struct

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-06-17 18:49:50 +08:00