RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-19 08:57:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
50,790 Commits 215 Branches 395 Tags 1.3 GiB
4e9b9539f1
Commit Graph

50790 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Loic Dachary
bf61156670 release-notes: draft v10.0.4 release notes 
Signed-off-by: Loic Dachary <loic@dachary.org>
 2016-03-08 12:03:42 +07:00
Sage Weil
c88b863c7f 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>
 2016-03-07 21:04:01 -05:00
Greg Farnum
ca0eed076b Merge branch 'wip-damage-table' of git://github.com/jcsp/ceph into greg-fs-testing 
Conflicts:
	src/mds/MDCache.cc

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
 2016-03-07 16:29:28 -08:00
Greg Farnum
976358111d Merge branch 'wip-scrub-repair' of git://github.com/ukernel/ceph into greg-fs-testing 
https://github.com/ceph/ceph/pull/6682

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
 2016-03-07 16:19:39 -08:00
Sage Weil
796331d6a1 Merge branch 'master' of github.com:ceph/ceph 2016-03-07 15:58:44 -05:00
Sage Weil
37f14a5d94 Merge branch 'wip-conf-root' of https://github.com/liewegas/ceph 
Reviewed-by: Josh Durgin <jdurgin@redhat.com>

Conflicts:
	src/common/config.cc
 2016-03-07 15:36:13 -05:00
Josh Durgin
9ef7bb15bd 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>
 2016-03-07 12:07:51 -08:00
Erwan Velu
754d2103e1 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>
 2016-03-07 20:27:07 +01:00
Erwan Velu
019d9e17a7 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>
 2016-03-07 20:27:07 +01:00
Erwan Velu
7d48d21a53 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>
 2016-03-07 20:27:06 +01:00
Sage Weil
216967d60b 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>
 2016-03-07 12:28:22 -05:00
Sage Weil
f78d7e8b6d Merge pull request #7705 from renhwsky/renhw-wip-pgmonitor-get_rule_avail 
mon/pgmonitor: use appropriate forced conversions in get_rule_avail
 2016-03-07 12:27:40 -05:00
Sage Weil
3634ed52f8 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>
 2016-03-07 12:27:07 -05:00
Sage Weil
b62add00a0 Merge pull request #7845 from aiicore/pthread_setname_fix 
common: set thread name from correct thread

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-03-07 12:25:13 -05:00
Sage Weil
6fc5c46097 Merge pull request #7850 from jupiturliu/kstore-latency 
osd: kstore: latency breakdown

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-03-07 12:24:40 -05:00
Sage Weil
3a72d21e30 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>
 2016-03-07 12:23:46 -05:00
Sage Weil
020c78940e 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>
 2016-03-07 12:23:06 -05:00
Karol Mroz
60b71ec0e3 stop: Add missing stop_rgw variable 
Signed-off-by: Karol Mroz <kmroz@suse.com>
 2016-03-07 17:41:12 +01:00
Loic Dachary
80ef3477bf Merge pull request #7954 from SUSE/wip-docdev 
doc/dev: various refinements

Reviewed-by: Loic Dachary <ldachary@redhat.com>
 2016-03-07 23:22:33 +07:00
Nathan Cutler
4a5875a184 doc/dev: start Testing in the cloud chapter 
Signed-off-by: Nathan Cutler <ncutler@suse.com>
 2016-03-07 16:00:01 +01:00
Mykola Golub
f7eb860d48 rbd-mirror: avoid recursive lock in timer 
m_lock is used both by m_timer and refresh_images(), which is
scheduled by the timer, so run it with `safe_callbacks = false`.

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
 2016-03-07 15:05:18 +02:00
Mykola Golub
303e2c989a rbd-mirror: properly update replayers 
Previously update_replayers always deleted replayers due to using
empty peers set.

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
 2016-03-07 15:05:11 +02:00
Mykola Golub
803eb511dc rbd-mirror: spawn replayer thread 
Also, wait for it to finish only if it has been started.

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
 2016-03-07 15:05:04 +02:00
Mykola Golub
ed035a3bf3 rbd-mirror: don't log error on empty pool 
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
 2016-03-07 15:04:56 +02:00
Mykola Golub
098be66cee rbd-mirror: improve logging 
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
 2016-03-07 15:04:35 +02:00
Nathan Cutler
37afe5c53b doc/dev: various refinements 
Signed-off-by: Nathan Cutler <ncutler@suse.com>
 2016-03-07 10:27:42 +01:00
Kefu Chai
6d31e5dfa8 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>
 2016-03-07 17:19:29 +08:00
Yan, Zheng
2da9449613 mds: set ScrubHeader for dirfrag when doing non-recursive scrub 
Signed-off-by: Yan, Zheng <zyan@redhat.com>
 2016-03-07 15:59:13 +08:00
Yan, Zheng
aa1477f1bc mds: improve debug message for CInode::validate_disk_state 
Signed-off-by: Yan, Zheng <zyan@redhat.com>
 2016-03-07 15:59:13 +08:00
Yan, Zheng
a656f94ff5 mds: improve debug message for CDir::check_rstat() 
Signed-off-by: Yan, Zheng <zyan@redhat.com>
 2016-03-07 15:59:13 +08:00
Yan, Zheng
1c52d44444 mds: remove unused 'Context *' parameter from MDCache::repair_foo_stats() 
Signed-off-by: Yan, Zheng <zyan@redhat.com>
 2016-03-07 15:59:13 +08:00
Yan, Zheng
7f83e3df62 mds: report dirfrag stats error found by scrub 
Signed-off-by: Yan, Zheng <zyan@redhat.com>
 2016-03-07 15:59:13 +08:00
Yan, Zheng
d98c516af7 mds: use MDSInternalContextBase instead of Context in scrub stack code 
Signed-off-by: Yan, Zheng <zyan@redhat.com>
 2016-03-07 15:59:13 +08:00
Yan, Zheng
82bd4716b2 mds: queue non-recursive scrub to top of scrub stack 
non-recursive scrub blocks admin socket, make it have earliest service

Signed-off-by: Yan, Zheng <zyan@redhat.com>
 2016-03-07 15:59:13 +08:00
Yan, Zheng
c8609d1301 Continuation: delete self after calling _done() 
make sure Continuation delete itself even when virtual function
_done() is overwrited.

Signed-off-by: Yan, Zheng <zyan@redhat.com>
 2016-03-07 15:59:13 +08:00
Yan, Zheng
f8749997a1 mds: improve passed_validation check. 
Signed-off-by: Yan, Zheng <zyan@redhat.com>
 2016-03-07 15:59:13 +08:00
Yan, Zheng
700e51313a mds: fix typo 
Signed-off-by: Yan, Zheng <zyan@redhat.com>
 2016-03-07 15:59:13 +08:00
Yan, Zheng
72b9339e96 mds: and 'force' options to scrub_path asok command 
'force' means check whole subtree (don't skip scrubbing entries
not modified since last scrub)

Signed-off-by: Yan, Zheng <zyan@redhat.com>
 2016-03-07 15:59:13 +08:00
Yan, Zheng
f2d01c1863 mds: remove obsoleted FIXME from scrubstack code 
Signed-off-by: Yan, Zheng <zyan@redhat.com>
 2016-03-07 15:59:13 +08:00
Yan, Zheng
84ed3cd7b9 mds: make scrubstack queue CInode instead of CDentry 
There are two problems that enqueue CDentry in scrub stack. First,
the scrub stack code can't handle base inodes; second, the linkage
of a CDentry can change in the middle of scrubbing, this can confuse
the scrub stack code.

Signed-off-by: Yan, Zheng <zyan@redhat.com>
 2016-03-07 15:59:13 +08:00
Yan, Zheng
f13fb47902 mds: don't ignore scrubbing non-regular non-directory inodes 
The overhead of scrubbing them is low, so don't treat them specially.

Signed-off-by: Yan, Zheng <zyan@redhat.com>
 2016-03-07 15:59:13 +08:00
Yan, Zheng
2a671521fc mds: and 'recursive/repair' options to scrub_path asok command 
Signed-off-by: Yan, Zheng <zyan@redhat.com>
 2016-03-07 15:59:13 +08:00
Yan, Zheng
6cda4de902 mds: remove old scrub_dentry code 
Signed-off-by: Yan, Zheng <zyan@redhat.com>
 2016-03-07 15:59:13 +08:00
Yan, Zheng
a51fd65621 mds: use scrubstack code to scrub single dentry 
Signed-off-by: Yan, Zheng <zyan@redhat.com>
 2016-03-07 15:59:13 +08:00
Yan, Zheng
db12397ff1 mds: handle non-recursive scrubbing 
Signed-off-by: Yan, Zheng <zyan@redhat.com>
 2016-03-07 15:59:13 +08:00
Yan, Zheng
dad48ecb13 mds: store ScrubHeader refernce in CInode's scrub_info_t 
Signed-off-by: Yan, Zheng <zyan@redhat.com>
 2016-03-07 15:59:13 +08:00
Yan, Zheng
f2de29e3a1 mds: scrub fragstat.mtime and rstat.rctime 
Signed-off-by: Yan, Zheng <zyan@redhat.com>
 2016-03-07 15:59:13 +08:00
Yan, Zheng
e3fdaae926 mds: set bad dirfrag's version to 1 
there are lots of places assume 'version == 0' means dirfrag is
uninitialized

Signed-off-by: Yan, Zheng <zyan@redhat.com>
 2016-03-07 15:59:13 +08:00
Yan, Zheng
a2def5e29f mds: don't getxattr and setxattr at the same time 
If an osd request contains write operation, the reply will not
carry output data. So we can't getxattr and setxattr in single
OSD request.

Signed-off-by: Yan, Zheng <zyan@redhat.com>
 2016-03-07 15:59:12 +08:00
Yan, Zheng
1cc9d52ef7 mds: check all items even when CInode::validate_disk_state() finds errors 
Signed-off-by: Yan, Zheng <zyan@redhat.com>
 2016-03-07 15:59:12 +08:00