Commit Graph

44785 Commits

Author SHA1 Message Date
John Spray
15e19a4a62 client: refactor quota check functions
Generalise the path traversal into check_quota_condition
and then call that from each of file_exceeded, bytes_exceeded,
bytes_approaching with the appropriate lambda function.

Motivated by fixing the path traversal and wanting to
only fix it in one place.

Signed-off-by: John Spray <john.spray@redhat.com>
2015-09-25 13:24:00 +01:00
Kefu Chai
6f11b82f30 Merge pull request #6063 from dachary/wip-tar-v7
build/ops: make dist needs files with names > 99 characters

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-09-24 17:23:03 +08:00
Orit Wasserman
2028ba2b49 Merge pull request #5694 from guce/rgw_improve_key_operate
rgw: improve convenience for key operate.
2015-09-24 10:08:13 +02:00
Loic Dachary
396702aabf build/ops: make dist needs files with names > 99 characters
When running make distdir=ceph-9.0.3-1870-gfd861bb dist, a few files
have names longer than 99 characters and discarded, which then causes
the resulting tarbal to be incomplete:

tar: ceph-9.0.3-1870-gfd861bb/src/rocksdb/utilities/write_batch_with_index/write_batch_with_index_internal.cc: file name is too long (max 99); not dumped
tar: ceph-9.0.3-1870-gfd861bb/src/rocksdb/utilities/write_batch_with_index/write_batch_with_index_internal.h: file name is too long (max 99); not dumped

Use the tar-ustar format instead of the legacy v7
format (http://www.gnu.org/software/automake/manual/automake.html#Options). It
is unlikely machines with a C++11 compiler also have an antique tar
binary that would only support v7.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-09-24 08:07:20 +02:00
Sage Weil
fd861bb250 Merge pull request #6053 from ceph/wip-cmake-dang
Wip cmake dang
2015-09-23 17:00:48 -04:00
Sage Weil
2805246a74 Merge pull request #6056 from guangyy/wip-13198
osd: print min_last_epoch_clean along with pg dump

Reviewed-by: Sage Weil <sage@redhat.com>
2015-09-23 16:59:06 -04:00
Sage Weil
704cd5d30d Merge remote-tracking branch 'gh/wip-aarch64' 2015-09-23 15:08:22 -04:00
Guang Yang
f5359f2314 osd: print min_last_epoch_clean along with pg dump
Fixes: 13198
Signed-off-by: Guang Yang <yguang@yahoo-inc.com>
2015-09-23 15:58:02 +00:00
Daniel Gryniewicz
b1401e5124 CMake - fix check for UDEV
Signed-off-by: Daniel Gryniewicz <dang@fprintf.net>
2015-09-23 10:55:55 -04:00
Daniel Gryniewicz
0b27024698 CMake - fix check for FUSE
Signed-off-by: Daniel Gryniewicz <dang@fprintf.net>
2015-09-23 10:55:55 -04:00
Daniel Gryniewicz
a866a8947d CMake - add check for libedit
Signed-off-by: Daniel Gryniewicz <dang@fprintf.net>
2015-09-23 10:55:54 -04:00
Daniel Gryniewicz
4d02f8746c CMake - fix check for Snappy
Signed-off-by: Daniel Gryniewicz <dang@fprintf.net>
2015-09-23 10:55:54 -04:00
Daniel Gryniewicz
3570dd5625 CMake - add check for XFS
Signed-off-by: Daniel Gryniewicz <dang@fprintf.net>
2015-09-23 10:55:54 -04:00
Daniel Gryniewicz
571215ef20 CMake - fix check for AIO
Signed-off-by: Daniel Gryniewicz <dang@fprintf.net>
2015-09-23 10:55:54 -04:00
Daniel Gryniewicz
6adf1cbb33 CMake - fix check for blkid
Signed-off-by: Daniel Gryniewicz <dang@fprintf.net>
2015-09-23 10:55:54 -04:00
Daniel Gryniewicz
1a4262c31a CMake - add check for libcurl
Signed-off-by: Daniel Gryniewicz <dang@fprintf.net>
2015-09-23 10:55:54 -04:00
Daniel Gryniewicz
a6c8b46101 CMake - fix check for fcgi
Signed-off-by: Daniel Gryniewicz <dang@fprintf.net>
2015-09-23 10:55:54 -04:00
Daniel Gryniewicz
88f7df7d1a CMake - add check for libuuid
Signed-off-by: Daniel Gryniewicz <dang@fprintf.net>
2015-09-23 10:55:54 -04:00
Daniel Gryniewicz
a18b649c1e CMake - fix check for leveldb
Signed-off-by: Daniel Gryniewicz <dang@fprintf.net>
2015-09-23 10:55:54 -04:00
Daniel Gryniewicz
cb7fe45823 CMake - fix check for expat
Signed-off-by: Daniel Gryniewicz <dang@fprintf.net>
2015-09-23 10:55:54 -04:00
Daniel Gryniewicz
a7ce8f5d68 CMake - Add check for keyutils
Signed-off-by: Daniel Gryniewicz <dang@fprintf.net>
2015-09-23 10:55:54 -04:00
Daniel Gryniewicz
dcf647ec04 CMake - fix check for NSS
Signed-off-by: Daniel Gryniewicz <dang@fprintf.net>
2015-09-23 10:55:54 -04:00
Daniel Gryniewicz
b02e0f9bfe CMake - fix libatomic_ops and gperftools checks
Signed-off-by: Daniel Gryniewicz <dang@fprintf.net>
2015-09-23 10:55:54 -04:00
Sage Weil
3afd5178ff Merge remote-tracking branch 'gh/infernalis' 2015-09-23 10:46:51 -04:00
Sage Weil
3123b2c5d3 arch/arm: s/false/0/
arch/arm.c: In function 'ceph_arch_arm_probe':
arch/arm.c:54:28: error: 'false' undeclared (first use in this function)
  ceph_arch_aarch64_crc32 = false;  // sorry!
                            ^
arch/arm.c:54:28: note: each undeclared identifier is reported only once for each function it appears in

Signed-off-by: Sage Weil <sage@redhat.com>
2015-09-23 08:20:39 -04:00
guce
7e5980b4a3 rgw: improve convenience for key operate.
1.key-type assignments based on context if it wasn't specified
In user    operate context, key-type assignment to KEY_TYPE_S3
In subuser operate context, key-type assignment to KEY_TYPE_SWIFT
In key     operate context, key-type assignment based on user type

2.fix RGWSubUserPool::add()
When create subuser generate secret by default

3.fix RGWAccessKeyPool::generate_key()
Avoid wrong key's username when create user and subuser at the same time
Check empty secret

Signed-off-by: Ce Gu <guce@h3c.com>
2015-09-23 09:52:16 +08:00
Sage Weil
68b5a8d10e Merge pull request #6037 from liewegas/wip-12407
init-radosgw: fix restart w/ multiple instances

Reviewed-by: Pavan Rallabhandi <pavan.rallabhandi@sandisk.com>
2015-09-22 15:12:17 -04:00
Orit Wasserman
f1ead76f80 Merge pull request #5928 from ceph/wip-12819-infernalis
Wip 12819 infernalis
2015-09-22 20:29:10 +02:00
Loic Dachary
8e6bf15fc9 Merge pull request #6006 from dachary/wip-12936-shec
erasure-code: workaround i386 optimization bug with SHEC

Reviewed-by: Sage Weil <sage@redhat.com>
2015-09-22 20:27:57 +02:00
Sage Weil
e17c8e1a7a init-radosgw: specify pid file to start-stop-daemon
This fixes restart when multiple instances are running.

Fixes: #12407
Tested-by: Pavan Rallabhandi <pavan.rallabhandi@sandisk.com>
Signed-off-by: Sage Weil <sage@redhat.com>
2015-09-22 14:13:43 -04:00
Sage Weil
fb5f058a92 Merge remote-tracking branch 'gh/infernalis' 2015-09-22 14:04:44 -04:00
David Zafman
424bcea999 Merge pull request #5922 from trociny/wip-pool-set-noscrub
osd: per pool control for scrub and deep-scrub

Reviewed-by: David Zafman <dzafman@redhat.com>
2015-09-22 09:32:18 -07:00
Kefu Chai
44a2609d1e Merge pull request #5846 from xiexingguo/xxg-wip-13002
msg/simple: start over after fails to bind a port in specified range

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-09-22 23:54:32 +08:00
Loic Dachary
426435899c erasure-code: workaround i386 optimization bug with SHEC
http://tracker.ceph.com/issues/12936 Fixes: #12936

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-09-22 16:33:50 +02:00
Loic Dachary
4b71a54606 Merge pull request #5999 from dachary/wip-13000-ceph-disk
ceph-disk: fixes various race conditions

Reviewed-by: Sage Weil <sage@redhat.com>
2015-09-22 16:29:16 +02:00
Samuel Just
008cdd7c7f Merge pull request #6008 from liewegas/wip-13190
osd/ReplicatedPG: tolerate promotion completion with stopped agent

Reviewed-by: Samuel Just <sjust@redhat.com>
2015-09-22 07:24:27 -07:00
Sage Weil
c93008fbef Merge pull request #6011 from liewegas/wip-systemd
systemd: increase nproc ulimit
2015-09-22 09:32:08 -04:00
Sage Weil
0a3b5ddf5b Merge pull request #6019 from liewegas/wip-mon-dispatch-debug
mon/PaxosService: include msg and con ptr in dispatch debug
2015-09-22 08:29:16 -04:00
Josh Durgin
6799f44fa8 Merge pull request #5956 from xinxinsh/wip-13124
unify order limit

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-09-22 03:07:43 -04:00
Loic Dachary
182676d6bf tests: ceph-disk: workunit must fail when test fail
Signed-off-by: Joe Julian <me@joejulian.name>
2015-09-22 08:46:57 +02:00
Loic Dachary
0cf0e88e29 tests: ceph-disk: only install multipath on CentOS
If installed on Ubuntu where multipath does not activate properly, it
interferes with the other tests.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-09-22 08:46:57 +02:00
Loic Dachary
fb4dd7d4f2 tests: ceph-disk: inline run_osd
Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-09-22 08:46:57 +02:00
Loic Dachary
24b3a800e6 tests: ceph-disk: wait for the OSD to be up
After preparing an OSD, wait for the corresponding OSD to be up
according to ceph osd dump before asserting the devices are in the
expected state. Otherwise the test races with ceph-disk activate which
is run asynchronously via udev / upstart / system.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-09-22 08:46:57 +02:00
Loic Dachary
46a3c93ab3 tests: ceph-disk: race condition is fixed
It turns out it was not CentOS 7 specific. There is no excuse to skip
the tests anymore.

http://tracker.ceph.com/issues/12787 Refs: #12787

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-09-22 08:46:57 +02:00
Loic Dachary
d24f1f10aa tests: ceph-disk: multipath now auto activates
http://tracker.ceph.com/issues/12786 Refs: #12786

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-09-22 08:46:57 +02:00
Loic Dachary
d4d5153cd4 tests: ceph-disk: use sh() instead of helper() when possible
Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-09-22 08:46:57 +02:00
Loic Dachary
b6470382f8 tests: doc: ceph-disk workunit reminders
Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-09-22 08:46:57 +02:00
Loic Dachary
22a1f4cf74 ceph-disk: reduce debug verbosity
There is no need for debug traces from which() and it is very
noisy. Just get rid of it.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-09-22 08:46:57 +02:00
Loic Dachary
c86438cdce ceph-disk: ensure udev add on the data partition is last
When calling partprobe, we make sure there is at least one udev add
called for each partition created when preparing a device. But there is
no guarantee that the udev add for data partition will be last and the
following scenario can happen:

 - udev add data partition fails because the journal partition is owned
   by root
 - udev add journal partition chown the journal partition
 - no other udev add event is sent and the OSD does not activate

An additional, possibly redundant, udev add event is fired after
partprobe is run and after udevadm settles, to guarantee there is at
least one udev add data partition after the last udev add journal
partition.

http://tracker.ceph.com/issues/12787 Fixes: #12787

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-09-22 08:46:57 +02:00
Loic Dachary
0dd2364984 ceph-disk: move update_partition from main_prepare to prepare_dev
The update_partition call in main_prepare happens immediately after
prepare_dev but only if the data argument is a block device. There is no
reason for this separation: it is more sensible to call it from within
prepare_dev.

There is an additional test in prepare_dev that verifies partprobe won't
be called on a partition because it would not make sense.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-09-22 08:46:56 +02:00