Commit Graph

56733 Commits

Author SHA1 Message Date
John Spray
019f1cf519 Merge pull request #10485 from gregsfortytwo/wip-client-dump-complete
client: include COMPLETE and ORDERED states in cache dump

Reviewed-by: John Spray <john.spray@redhat.com>
2016-08-05 12:00:05 +01:00
John Spray
4dcae90ed2 Merge pull request #10533 from gregsfortytwo/wip-mds-dispatch-refcount
mds: fix up _dispatch ref-counting semantics

Reviewed-by: John Spray <john.spray@redhat.com>
2016-08-05 11:59:21 +01:00
John Spray
f6d6bc7cc1 Merge pull request #10540 from jcsp/wip-mds-multimds-standby
mds: fix daemon selection when starting ranks

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2016-08-05 11:58:32 +01:00
Yan Jun
d1caad6789 rgw: remove unused variables
remove the unused bufferlist variables

Signed-off-by: Yan Jun <yan.jun8@zte.com.cn>
2016-08-05 16:50:20 +08:00
Jason Dillaman
4de7c8d0a7 librbd: prevent creation of v2 image ids that are too large
The librbd API is capped at 24 characters for expressing the
object prefix for data blocks (including trailing null byte).

Fixes: http://tracker.ceph.com/issues/16887
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-08-04 20:56:36 -04:00
Robin H. Johnson
921c556b65
rgw: Fix civetweb IPv6
Commit c38e3cbb6f introduced a second
compiled version of src/civetweb/src/civetweb.c, but did not pass the
configuration header (civetweb/include/civetweb_conf.h).

As a result, USE_IPV6 was not defined when it was compiled, and that
copy was included into the radosgw binary. This caused breakage for the
civetweb frontend when used with IPv6:
  rgw frontends = civetweb port=[::]:7480

Reintroduce the header so that civetweb is compiled correctly again.

Fixes: http://tracker.ceph.com/issues/16928
Backport: jewel
Signed-off-by: Robin H. Johnson <robin.johnson@dreamhost.com>
2016-08-04 17:15:18 -07:00
David Zafman
6fed82a086 Merge pull request #10565 from dzafman/wip-16672
OSD crash with Hammer to Jewel Upgrade: void FileStore::init_temp_collections()

Reviewed-by: Samuel Just <sjust@redhat.com>
2016-08-04 17:01:12 -07:00
Jason Dillaman
b0dbd1ff50 Merge pull request #10545 from trociny/fixup-rbd-mirror-test
qa/workunits/rbd: wait for image deleted before checking health

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2016-08-04 17:01:57 -04:00
Ken Dreyer
8e8d55b797 doc: describe libvirt client logging
Describe how to configure logging and the admin socket for debugging RBD
libvirt clients.

Thanks to Jason Dillman <jdillama@redhat.com> on ceph-devel for this
information.

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
2016-08-04 12:30:24 -06:00
Jason Dillaman
dfe9f3eac9 librbd: delay acquiring exclusive lock if watch has failed
Fixes: http://tracker.ceph.com/issues/16923
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-08-04 14:05:19 -04:00
Jason Dillaman
814c305ce8 librbd: convert ImageWatcher class to template
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-08-04 13:49:19 -04:00
Willem Jan Withagen
0f18c347ce test: More portable use of mmap(MAP_ANON)
From the Linux manual:
  MAP_ANONYMOUS
     The  mapping  is  not  backed  by any file; its contents
     are initialized to zero.  The fd and offset arguments are
     ignored; however, some implementations require fd to be -1
     if MAP_ANONYMOUS (or MAP_ANON) is specified, and portable
     applications  should  ensure  this.

FreeBSD is such a case, it wil just return an error.

 - Used in:
     src/test/on_exit.cc
     src/test/system/cross_process_sem.cc

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
2016-08-04 19:06:47 +02:00
John Spray
367cb8407b Merge pull request #10566 from batrick/mds-daemon-unused
mds: remove unused MDSDaemon::objecter

Reviewed-by: John Spray <john.spray@redhat.com>
2016-08-04 14:10:45 +01:00
huanwen ren
d1277f116c doc/mds: add generated files into the /etc/ceph/
Fixes: 16906

Signed-off-by: huanwen ren <ren.huanwen@zte.com.cn>
2016-08-04 20:14:18 +08:00
xie xingguo
dae43c7f1c osd: add a comment for the purpose of pinned_maps
For a better understanding since it can confuse newcommers.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-08-04 10:33:49 +08:00
Patrick Donnelly
50903488d2
mds: remove unused MDSDaemon::objecter
Leftover from a2682edb76.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2016-08-03 22:04:17 -04:00
xie xingguo
00aeae84ea osd: use osd_target_transaction_size when batch removing objects
Hard code transaction size to be 300 is not good. Since we already
introduce osd_target_transaction_size for the same purpose, we can
use it directly here.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-08-04 07:08:50 +08:00
xie xingguo
8af1031790 osd: fix rare race while looking for a pg
When _have_pg() returns true, we drop the pg_map_lock
and pg->lock() simultaneously. So theoretically the
subsequent call to _lookup_lock_pg() can return NULL,
although the chance is rare.

Also, since we are going to call _lookup_lock_pg() anyway,
we can call it directly, thus the _have_pg() method is
totally unnecessary.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-08-04 07:05:44 +08:00
xie xingguo
5eccd8dcc5 osd: kill _lookup_pg() method
It is never used and I see no chance it will be used.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-08-04 07:05:43 +08:00
xie xingguo
686ef2ac9d osd: don't get transaction too big during clear_temp_objects()
Basically we don't allow a transaction to get too big, e.g., to
avoid contiguously occupation of CPU.

We break and queue the transaction here whenever we have collected
osd_target_transaction_size temp objects.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-08-04 07:05:43 +08:00
Matt Benjamin
f62f7abbc1 Merge pull request #10307 from pritha-srivastava/wip_s3_auth_rework
rgw: Rework of s3 LDAP Authentication code.

verified: MS AD
2016-08-03 12:39:26 -04:00
Adam Kupczyk
f444862de9 Got rid of recursive mutex.
Signed-off-by: Adam Kupczyk <akupczyk@mirantis.com>
2016-08-03 17:56:30 +02:00
Nathan Cutler
64b03dcf8d rpm: provide -devel library packages that are being obsoleted
This patch ensures that packages with the new name properly
replace old-named packages on upgrades.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-08-03 12:30:49 +02:00
Nathan Cutler
33b67ee6a0 rpm: drop obsolete devel-compat meta package
Everyone should upgrade through Firefly -> Hammer -> etc to pick up the newer
package names.

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-08-03 12:30:49 +02:00
Nathan Cutler
51cbbfe924 rpm: align librgw-devel dependencies with debian packaging
Fixes: http://tracker.ceph.com/issues/16346
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-08-03 12:30:49 +02:00
Nathan Cutler
bd8b51815d rpm: remove major version from shared library devel pkg names
Fixes: http://tracker.ceph.com/issues/16345
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-08-03 12:30:49 +02:00
David Zafman
ba88a3aac0 os: Fix HashIndex::recursive_remove() to remove everything but original path
Fixes: http://tracker.ceph.com/issues/16672

Signed-off-by: David Zafman <dzafman@redhat.com>
2016-08-02 23:55:41 -07:00
David Zafman
892303cd02 filestore: Clear objects before calling collection_list() again
Signed-off-by: David Zafman <dzafman@redhat.com>
2016-08-02 23:55:35 -07:00
David Zafman
b78c457785 filestore: Improve logging
Signed-off-by: David Zafman <dzafman@redhat.com>
2016-08-02 23:55:28 -07:00
Brad Hubbard
b40f4d43ca tests: Add test for global static non-POD segfault
libcommon.a is linked statically to librados and libcephfs. When the global
destructors for these libraries are called malloc code can report "double free
or corrpution" as the same resource may be deleted twice (global static
non-POD variable types). This test attempts to detect this issue.

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
2016-08-03 15:23:58 +10:00
huanwen ren
ff9a5cb2ef mds/MDBalancer: change OPT_FLOAT to OPT_DOUBLE
utime_t convert double in MDBalancer::tick(),
so g_conf->mds_bal_sample_interval should be set OPT_DOUBLE

Signed-off-by: huanwen ren <ren.huanwen@zte.com.cn>
2016-08-03 09:19:51 +08:00
huanwen ren
7905f31d5e mds/MDBalancer: redundance cleanup
Signed-off-by: huanwen ren <ren.huanwen@zte.com.cn>
2016-08-03 09:19:51 +08:00
huanwen ren
7c51349ba7 mds/MDBalancer: some types of definitions are cleanup
Signed-off-by: huanwen ren <ren.huanwen@zte.com.cn>
2016-08-03 09:19:51 +08:00
huanwen ren
5478769753 mds/MDBalancer: add err info when ifstream open failure
Signed-off-by: huanwen ren <ren.huanwen@zte.com.cn>
2016-08-03 09:19:33 +08:00
xie xingguo
30cffa0653 osd: initialize class_handler of OSD properly
The destructor of OSD will delete class_handler arbitrarily
and there are cases we'll fail to start an osd before we
load the class_handler correctly.

So it is safe to initialize class_handler to NULL as to
avoid access violation.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-08-03 06:21:08 +08:00
xie xingguo
420843a983 osd/ReplicatedPG: fix typo(from ECANCELLED to ECANCELED)
According to Linux Man pages:

  ECANCELED       Operation canceled (POSIX.1)

So ECANCELED is the preferred one.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-08-03 06:21:07 +08:00
xie xingguo
41b4c7a42d osd: add sanity check for scrubs_active counter
To make sure there is no underflow and the scrub logic
works fine.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-08-03 06:21:07 +08:00
xie xingguo
9ce5028eea osd: kill redundant call of cancel_all_events()
The agent_timer.shutdown() method will call cancel_all_events()
within in a more safe and elegant way, so we don't have to
call it explicitly here.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-08-03 06:21:07 +08:00
Patrick Donnelly
c162a8a08d
Merge remote-tracking branch 'upstream/pull/10543/head'
* upstream/pull/10543/head:
  vstart.sh: only delete conf if -n
2016-08-02 15:40:49 -04:00
Igor Fedotov
119f06fcc4 Merge pull request #10492 from chhabaramesh/master
os/bluestore: remove cmake warning from extent alloc functions

Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
2016-08-02 21:43:41 +03:00
Patrick Donnelly
c3ca7ad40c
vstart.sh: only delete conf if -n
src/test/ceph_objectstore_tool.py depends on an implicit "-k" when not
creating a new cluster. (Deleting the conf file without -n makes no
sense anyway.)

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2016-08-02 14:17:35 -04:00
Mykola Golub
57b69b9200 Merge pull request #10462 from dillaman/wip-16478
rbd-mirror: non-primary image is recording journal events during image sync

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
2016-08-02 20:48:07 +03:00
Mykola Golub
42905a6d3b Merge pull request #10484 from dillaman/wip-16538
rbd-mirror: image deleter should use pool id + global image uuid for key

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
2016-08-02 20:14:54 +03:00
Mykola Golub
a5f63f7261 qa/workunits/rbd: wait for image deleted before checking health
This is a fixup to the previous commit.

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2016-08-02 20:06:17 +03:00
John Spray
48cd11fece Merge pull request #10458 from gregsfortytwo/wip-doc-troubleshooting
doc: extend the CephFS troubleshooting guide

Reviewed-by: Zack Cerza <zack@redhat.com>
Reviewed-by: John Spray <john.spray@redhat.com>
2016-08-02 18:04:31 +01:00
Alfredo Deza
79b011881e Merge pull request #9695 from ktdreyer/doc-tarballs-url
doc: update canonical tarballs URL

Reviewed-by: Alfredo Deza <adeza@redhat.com>
2016-08-02 11:50:47 -04:00
Ramesh Chander
4fc84ad9f8 os/bluestore: remove cmake warning from extent alloc functions.
tracker link: http://tracker.ceph.com/issues/16766
Signed-off-by: Ramesh Chander <Ramesh.Chander@sandisk.com>
2016-08-02 08:39:28 -07:00
John Spray
01cd578cbc Merge pull request #10386 from ceph/wip-jlayton-nlink
Fix attribute handling at lookup time

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2016-08-02 16:29:45 +01:00
Kefu Chai
af113a4760 Merge pull request #10541 from tchaikov/wip-cmake
cmake: install ceph_test_rados_striper_api_*

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2016-08-02 23:10:08 +08:00
Kefu Chai
62e51717f3 cmake: install ceph_test_rados_striper_api_*
so we can test them in ceph-qa-suite

Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-08-02 22:38:00 +08:00