RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-17 17:05:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
55,620 Commits 211 Branches 394 Tags 2 GiB
d402cac7e6
Commit Graph

55620 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Josh Durgin
d402cac7e6 Merge pull request #9749 from songbaisen/a10 
mon: remove the redundant is_active judge in PaxosService

Reviewed-by: Samuel Just <sjust@redhat.com>
 2016-07-06 16:18:51 -07:00
Josh Durgin
c3806ff160 Merge pull request #9792 from stiopaa1/mon_monitorcc_addMutexLocker 
mon/Monitor.cc:replce lock/unlock with Mutex:Lockr

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Kefu Chai <kchai@redhat.com>
 2016-07-06 16:18:00 -07:00
Josh Durgin
2592bc72a0 Merge pull request #9939 from Yan-waller/yj-wip-radosclientwaitforosd 
rados/client: fix waiting on the condition variable more efficient.

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Sage Weil <sage@redhat.com>
 2016-07-06 16:17:20 -07:00
Josh Durgin
69b484331b Merge pull request #9947 from yuyuyu101/wip-remove-check 
osd: remove dispatch queue check since we don't queue hb message to this

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-07-06 16:16:18 -07:00
Josh Durgin
1c7ad3523d Merge pull request #9833 from onyb/wip-rados-pypi 
pybind: make rados ready for PyPI

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
 2016-07-06 16:01:50 -07:00
Sage Weil
a4250c7459 Merge pull request #10109 from xiexingguo/xxg-wip-bluestore-2016-07-02 
os/bluestore: simplify LRUCache::trim()

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-07-06 19:01:06 -04:00
Josh Durgin
3134a2dbc1 Merge pull request #8980 from stiopaa1/osd_unneededmapassign 
osd/OSD.h: remove unneeded line

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Kefu Chai <kchai@redhat.com>
 2016-07-06 15:57:28 -07:00
Josh Durgin
9c26b7c109 Merge pull request #8959 from hjwsm1989/hj-test 
os/filestore/LFNIndex: remove unused variable 'subdir_path'

Reviewed-by: Samuel Just <sjust@redhat.com>
 2016-07-06 15:56:13 -07:00
Josh Durgin
127862c674 Merge pull request #8687 from mslovy/wip-peering-msg-priority 
message: optimization for message priority strategy

Reviewed-by: Samuel Just <sjust@redhat.com>
 2016-07-06 15:55:30 -07:00
Sage Weil
58bd756d95 Merge pull request #10014 from gaowanlong/indent_caused_compile_warning 
build: fix wrong indent caused compile warning

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-07-06 14:41:42 -04:00
Mykola Golub
25ef9fd8c1 Merge pull request #9970 from dillaman/wip-16349 
rbd-mirror: gracefully handle being blacklisted

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
 2016-07-06 21:33:59 +03:00
Ali Maredia
0bd2abae70 Merge pull request #10016 from ceph/wip-cmake-rpm 
rpm: build rpm with cmake

Reviewed-by: Ali Maredia <amaredia@redhat.com>
 2016-07-06 12:54:09 -04:00
Jason Dillaman
2f55aa5e33 rbd-mirror: gracefully restart pool replayer when blacklisted 
Fixes: http://tracker.ceph.com/issues/16349
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2016-07-06 11:36:28 -04:00
Jason Dillaman
1fc27545c2 rbd-mirror: do not clear image replayer error code after shut down 
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2016-07-06 11:36:28 -04:00
Jason Dillaman
03c2aec4c6 rbd-mirror: image deleter should use provided librados connection 
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2016-07-06 11:36:28 -04:00
Jason Dillaman
48f301decb rbd-mirror: each pool replayer should use its own librados connection 
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2016-07-06 11:36:11 -04:00
Kefu Chai
c70f120368 Merge pull request #10145 from dillaman/wip-cmake-rbd-python 
cmake: fix incorrect dependencies to librados

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
 2016-07-06 21:23:07 +08:00
John Spray
0a0b0eb9a5 Merge pull request #10119 from renhwztetecs/renhw-wip-cdentry-dump 
mds: fixup dump Formatter' type error; add path_ino and is_primary in the CDentry::dump()

Reviewed-by: John Spray <john.spray@redhat.com>
 2016-07-06 14:16:21 +01:00
John Spray
b7ba134782 Merge pull request #10062 from renhwztetecs/renhw-wip-filer 
client/filer: cleanup the redundant judgments of _write&&_fallocate

Reviewed-by: John Spray <john.spray@redhat.com>
 2016-07-06 14:13:45 +01:00
John Spray
40208315c9 Merge pull request #10027 from batrick/client-root-lock 
client: add missing client_lock for get_root

Reviewed-by: John Spray <john.spray@redhat.com>
 2016-07-06 14:12:55 +01:00
John Spray
47d3abe62e Merge pull request #10100 from fullerdj/wip-djf-16144 
tools/cephfs: Remove cephfs-data-scan tmap_upgrade

Reviewed-by: John Spray <john.spray@redhat.com>
 2016-07-06 14:12:09 +01:00
John Spray
835fdcac2d Merge pull request #9971 from fullerdj/wip-djf-16288 
mds: Kill C_SaferCond in evict_sessions()

Reviewed-by: John Spray <john.spray@redhat.com>
 2016-07-06 14:11:21 +01:00
Jason Dillaman
a21b3df0ad cmake: fix incorrect dependencies to librados 
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2016-07-06 00:12:03 -04:00
Kefu Chai
c8b36efd15 rpm: build rpm with cmake 
Signed-off-by: Kefu Chai <kchai@redhat.com>
 2016-07-06 10:07:20 +08:00
Jason Dillaman
b342bf8ea1 Merge pull request #10136 from runsisi/sisi-wip-fix-missing-return 
librbd: fix missing return statement if failed to get mirror image state

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
 2016-07-05 21:44:32 -04:00
Samuel Just
2daf3ef220 Merge pull request #10094 from athanatos/wip-throttle-test 
test/common/Throttle.cc: fix race in shutdown

Reviewed-by: David Zafman <dzafman@redhat.com>
 2016-07-05 10:50:50 -07:00
Casey Bodley
953fdecf15 Merge pull request #10088 from pritha-srivastava/wip_s3_signedurl_errors 
rgw: Fix for using port 443 with pre-signed urls.

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Matt Benjamin <mbenjamin@redhat.com>
 2016-07-05 13:37:15 -04:00
Ali Maredia
59a46b96a5 Merge pull request #10112 from tchaikov/wip-cmake 
cmake changes

Reviewed-by: Ali Maredia <amaredia@redhat.com>
 2016-07-05 11:29:24 -04:00
Jason Dillaman
a700116ded Merge pull request #10134 from trociny/wip-run-rbd-tests-fixup 
test: run-rbd-tests test cmake fixup

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
 2016-07-05 08:27:42 -04:00
Kefu Chai
0c13676126 Merge pull request #10133 from tchaikov/wip-fixc-cephtool-test.sh 
test: cephtool/test.sh: fix expect_false() calls

Reviewed-by: Loic Dachary <ldachary@redhat.com>
 2016-07-05 17:46:39 +08:00
Mykola Golub
8a1fa024a4 Merge pull request #10072 from dillaman/wip-16561 
librbd: failed assertion after shrinking a clone image twice

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
 2016-07-05 11:44:45 +03:00
runsisi
ea775178b6 librbd: fix missing return statement if failed to get mirror image state 
Signed-off-by: runsisi <runsisi@zte.com.cn>
 2016-07-05 16:08:40 +08:00
Kefu Chai
5e16f2379d test: cephtool/test.sh: fix expect_false with pipe 
this fixes failures like,

/home/jenkins-build/build/workspace/ceph-pull-requests/qa/workunits/cephtool/test.sh:
line 32: ceph osd blacklist ls | grep 192.168.0.1: command not found

where the failure is not the "failure" we are expecting.

in our tests, following command

expect_false "ceph osd blacklist ls | grep 192.168.0.1"

is designed to to verify that "ceph osd blacklist ls | grep 192.168.0.1"
fails with non-zero return code. but expect_false() evaluates the command
line using plain "$@", which will send the arguments direct to the shell,
and $0 is "ceph auth get client.xx | grep caps | grep mon", which does
not exist and is not built-in command. so we need to check the grep
command instead.

for multiple piped command line, use

expect_false sh <<< "echo foo  | grep bar | grep baz"

Signed-off-by: Kefu Chai <kchai@redhat.com>
 2016-07-05 15:26:43 +08:00
Mykola Golub
acb4d67b0e test: run-rbd-tests test cmake fixup 
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
 2016-07-05 09:27:00 +03:00
Mykola Golub
5485296a3d Merge pull request #10076 from dillaman/wip-rbd-mirror-cmake 
test: fix rbd-mirror workunit test cases for cmake

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
 2016-07-05 08:28:43 +03:00
Kefu Chai
38afdbe590 Merge pull request #9731 from badone/wip-doc-ceph-authtool-print-fix 
doc: ceph-authtool man page option is --print-key not --print

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2016-07-05 13:03:46 +08:00
Kefu Chai
161e44554a Merge pull request #10124 from trociny/wip-cmake-tests 
test: cmake related fixups for rbd tests

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
 2016-07-05 11:26:46 +08:00
xie xingguo
25db05d3e7 os/bluestore: make sure path_fd is correctly closed during destruction 
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
 2016-07-05 10:10:53 +08:00
xie xingguo
27657d6c80 os/bluestore: simplify buffer eviction logic of LRUCache 
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
 2016-07-05 10:10:53 +08:00
Mykola Golub
3f66da7239 test: fix run-rbd-tests test for cmake 
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
 2016-07-04 22:32:29 +03:00
Mykola Golub
8d1959ccfc test: fix run-rbd-valgrind-unit-tests when built with cmake 
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
 2016-07-04 22:32:20 +03:00
Mykola Golub
0c4063d6b7 test: ceph_test_librbd does not need rados_test_stub 
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
 2016-07-04 22:32:11 +03:00
Sage Weil
fa8107a0c5 Merge pull request #10117 from xiexingguo/xxg-wip-bluestore-2016-07-04 
os/bluestore: fix incorrect pool decoding of bnode

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-07-04 10:55:29 -04:00
Kefu Chai
c6286c231c Merge pull request #9755 from dx9/wip-ns-name-uncompress 
common/dns_resolve: use ns_name_uncompress instead of ns_name_ntop

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2016-07-04 21:53:20 +08:00
Kefu Chai
873aba7dd9 Merge pull request #9766 from dx9/wip-autotools-arch 
configure.ac: Use uname instead of arch.

Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
 2016-07-04 21:49:41 +08:00
Kefu Chai
ed473638e5 Merge pull request #9772 from tchaikov/wip-close-on-exec 
msgr: set close on exec flag

Reviewed-by: Haomai Wang <haomai@xsky.com>
 2016-07-04 21:47:42 +08:00
Kefu Chai
0efb391a40 Merge pull request #9820 from dx9/wip-fix-res-query-detect 
configure.ac: fix res_query detection

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2016-07-04 21:46:55 +08:00
Kefu Chai
81ca1cbdd7 Merge pull request #9845 from dx9/wip-config-basename 
common: remove basename() dependency

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2016-07-04 21:46:14 +08:00
Kefu Chai
c5d50caa67 Merge pull request #9969 from liewegas/wip-assert 
include/assert: clean up ceph assertion macros

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
 2016-07-04 21:44:17 +08:00
Kefu Chai
a758a028b6 Merge pull request #9983 from SUSE/wip-cmake-fix-fcgi-include-dir 
cmake: Fix FCGI include directory

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2016-07-04 21:43:24 +08:00