RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-15 23:07:55 +00:00
Code Issues Packages Projects Releases Wiki Activity
50,790 Commits 216 Branches 395 Tags 1.2 GiB
4e9b9539f1
Commit Graph

50790 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Spray
4e9b9539f1 mon: update for multiple filesystems 
This is a big logic change throughout MDSMonitor,
and additonally some new commands to handle
per-fs variants of what used to be global things.

Signed-off-by: John Spray <john.spray@redhat.com>
 2016-03-10 12:11:23 +00:00
John Spray
ccbd266523 messages: add MFSMap 
For mon clients that subscribe to 'fsmap'.

Signed-off-by: John Spray <john.spray@redhat.com>
 2016-03-10 11:18:29 +00:00
John Spray
00022bf9f5 mds: add FSMap 
FSMap encapsulates a collection of MDSMaps, one
for each filesystem, and a collection of standby
MDS daemons that haven't been assigned to
a filesystem yet.

Signed-off-by: John Spray <john.spray@redhat.com>
 2016-03-10 11:18:29 +00:00
John Spray
ce37bbfe72 mds: introduce fs_cluster_id_t type 
Unique identifier for a filesystem within
the ceph cluster.  Abbreviated to `fscid`,
deliberately chosen to not conflict
with legacy "fsid" identifiers.

Additionally add mds_role_t type which is
a more general form of rank: ranks are
now only unique within a particular fscid.
Roles are a fscid plus a rank.

Signed-off-by: John Spray <john.spray@redhat.com>
 2016-03-10 11:18:29 +00:00
John Spray
5a32017622 mds: handle get_mds_info as const 
Signed-off-by: John Spray <john.spray@redhat.com>
 2016-03-10 11:18:29 +00:00
John Spray
22ff1224fd qa: update cephtool test for CephFS multi filesystems 
Includes adding test for the enable_multiple flag.

Signed-off-by: John Spray <john.spray@redhat.com>
 2016-03-10 11:18:28 +00:00
John Spray
99c175097c doc: cephfs admin command list 
Creating this skeleton to include the new
"ceph fs ..." commands.  Needs filling out
with prose about purpose and result of
commands.

Signed-off-by: John Spray <john.spray@redhat.com>
 2016-03-10 11:18:28 +00:00
John Spray
1cd71d35de messages: fix strings for MMonGetVersionReply 
It previously described itself as "mon_check_map_ack"

Signed-off-by: John Spray <john.spray@redhat.com>
 2016-03-10 11:18:28 +00:00
John Spray
c3a8a09e4d java: update libcephfs tests to learn pool name 
Don't assume the data/metadata pools are called
"data" and "metadata".

Signed-off-by: John Spray <john.spray@redhat.com>
 2016-03-10 11:18:28 +00:00
John Spray
8ae92c10b5 java: add O_DIRECTORY to libcephfs interface 
Signed-off-by: John Spray <john.spray@redhat.com>
 2016-03-10 11:18:28 +00:00
John Spray
7778d162d7 include/CompatSet: trivial const-ness fix 
Signed-off-by: John Spray <john.spray@redhat.com>
 2016-03-10 11:18:28 +00:00
John Spray
9ff5cb18fe vstart: don't set max_mds to use all daemons 
This is only useful if you want to test a
single namespace with no standbys.  It's easier
to initially have max_mds=1 and increase it
later than it is to go through the ritual
of decreasing max_mds and then deactivating
a daemon and waiting for it to stop.

Signed-off-by: John Spray <john.spray@redhat.com>
 2016-03-10 11:18:28 +00:00
John Spray
a30d9ca5ad vstart: don't call "fs new" repeatedly 
It was doing it once for each MDS, which is safe
(because it's idempotent) but silly.

Signed-off-by: John Spray <john.spray@redhat.com>
 2016-03-10 11:18:28 +00:00
Sage Weil
93fdd95bb9 mon: initialize last_* timestamps on new pgs to creation time 
Currently, when you create a pool, until the PGs peer you generate a health
error like

            8 pgs are stuck inactive for more than 300 seconds

which is inaccurate and misleading.  Instead, set the timestamps to the
creation time so that warnings don't appear until it's clear they're stuck.

Fixes: #14952
Signed-off-by: Sage Weil <sage@redhat.com>
 2016-03-10 11:18:28 +00:00
Greg Farnum
c49de8c1c2 Merge remote-tracking branch 'origin/jewel' 
Conflicts:
	src/client/Client.h
Signed-off-by: Greg Farnum <gfarnum@redhat.com>
 2016-03-10 00:56:37 -08:00
Gregory Farnum
dedcbc6bc2 Merge pull request #7495 from ukernel/jewel-10436 
client: flush kernel pagecache before creating snapshot

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
 2016-03-10 00:52:17 -08:00
Gregory Farnum
44f7b87263 Merge pull request #7798 from ukernel/wip-mds-snap 
A few more snapshot fixes, mostly around snapshotted inode/dentry tracking

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
 2016-03-09 22:49:46 -08:00
Gregory Farnum
d783e96775 Merge pull request #7994 from ukernel/jewel-14996 
Merge: Fix client handling of "lost" open directories on shutdown

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
 2016-03-09 22:43:04 -08:00
Greg Farnum
9f69cb1a81 Merge remote-tracking branch 'origin/greg-fs-testing-3-7-damage' 2016-03-09 22:25:25 -08:00
Gregory Farnum
eaded2ea4c Merge pull request #7686 from david-z/wip-fix-fh-ref-leak 
ceph-fuse: Fix potential filehandle ref leak at umount

Reviewed-by: Yan, Zheng <zyan@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
 2016-03-09 22:25:42 -08:00
Gregory Farnum
d63186f4fd Merge pull request #7685 from david-z/wip-fix-put-free-fd-back 
[cephfs] fix free fds being exhausted eventually because freed fds are never put back

Reviewed-by: Yan, Zheng <zyan@redhat.com>
 2016-03-09 22:24:22 -08:00
Gregory Farnum
9ae8486875 Merge pull request #7003 from jcsp/wip-cephfs-tmap-migrate 
tools/cephfs: add tmap_upgrade

Reviewed-by: David Zafman <dzafman@redhat.com>
Reviewed-by: Yan, Zheng <zyan@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
 2016-03-09 22:22:42 -08:00
Gregory Farnum
6f81a7ad9b Merge pull request #8014 from ukernel/wip-15038 
mds: fix inode_t::compare()

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
 2016-03-09 22:12:07 -08:00
Dan Mick
1856de3848 Merge pull request #8012 from zmc/jewel 
man/8/ceph-disk: fix formatting issue

Reviewed-by: Dan Mick <dmick@redhat.com>
 2016-03-09 19:40:04 -08:00
Yan, Zheng
9b79d05c59 mds: fix inode_t::compare() 
Fixes: #15038
Signed-off-by: Yan, Zheng <zyan@redhat.com>
 2016-03-10 10:50:07 +08:00
Josh Durgin
4fdd10d59d Merge pull request #7978 from dillaman/wip-14908 
librbd: refresh image if required before replaying journal ops

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2016-03-09 17:51:02 -08:00
Josh Durgin
e3ea4e390f Merge pull request #8009 from dillaman/wip-14988 
test: reproducer for writeback CoW deadlock

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2016-03-09 17:30:08 -08:00
Josh Durgin
4260b08fe1 Merge pull request #8005 from dillaman/wip-rbd-lock-fence 
pybind: flag an RBD image as closed regardless of result code

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2016-03-09 17:25:55 -08:00
Josh Durgin
facd50d531 Merge pull request #8001 from dillaman/wip-rbd-cram 
test: update rbd integration cram tests for new default features

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2016-03-09 17:23:54 -08:00
Jason Dillaman
0d9fb7a749 test: reproducer for writeback CoW deadlock 
Refs: #14988

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2016-03-09 20:06:46 -05:00
Sage Weil
977bed095d man/8/ceph-disk: fix formatting issue 
ERROR: /srv/autobuild-ceph/gitbuilder.git/build/doc/man/8/ceph-disk.rst:39: Unexpected indentation.
WARNING: /srv/autobuild-ceph/gitbuilder.git/build/doc/man/8/ceph-disk.rst:40: Block quote ends without a blank line; unexpected unindent.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 8dcaacbb05)
 2016-03-09 16:46:21 -07:00
Josh Durgin
3d404f2e1c Merge pull request #7906 from dillaman/wip-14869 
journal: re-use common threads between journalers

Conflicts:
	src/journal/JournalPlayer.cc
	src/librbd/Journal.cc
	src/test/rbd_mirror/image_replay.cc
	src/tools/rbd_mirror/ImageReplayer.h
	src/tools/rbd_mirror/Mirror.cc

(merged interface changes to ImageReplayer, and reduced scope for
change to JournalPlayer due to pr #7884 (wip-14663)).

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2016-03-09 14:18:13 -08:00
Josh Durgin
cfed9b6afd Merge pull request #7958 from trociny/wip-rbd-mirror-fixup 
rbd-mirror: minor fix-ups for initial skeleton implementation

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2016-03-09 14:03:48 -08:00
Josh Durgin
55efa7ae74 Merge pull request #7884 from dillaman/wip-14663 
librbd: allocate new journal tag after acquiring exclusive lock

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2016-03-09 14:02:38 -08:00
Josh Durgin
3538f11145 Merge pull request #7772 from xinxinsh/wip-14789 
librbd: truncate does not need to mark the object as existing in the object map

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2016-03-09 14:01:54 -08:00
Zack Cerza
89daecf496 Merge pull request #8003 from liewegas/wip-ceph-disk-doc 
man/8/ceph-disk: fix formatting issue
 2016-03-09 14:32:50 -07:00
Sage Weil
9a480e23b8 Merge pull request #7927 from oritwas/wip-rgw-fix-default 
rgw: RGWZoneParams::create should not handle -EEXIST error

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
 2016-03-09 16:13:16 -05:00
Sage Weil
cec8f23b6a Merge remote-tracking branch 'gh/jewel' 2016-03-09 15:45:38 -05:00
Sage Weil
5e23cba187 Merge pull request #7768 from xinxinsh/wip-fix-zero 
osd: filestore: FALLOC_FL_PUNCH_HOLE must be used with FALLOC_FL_KEEP_SIZE

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2016-03-09 15:05:28 -05:00
Sage Weil
811229baa4 Merge pull request #7844 from xiexingguo/xxg-wip-14922 
osd: replicatedpg: break out loop if we encounter fatal error during do_pg_op()

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-03-09 15:03:42 -05:00
Sage Weil
9c13921f38 Merge pull request #7864 from dillaman/wip-librados-aio-notify 
librados: race condition on aio_notify completion handling

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2016-03-09 15:03:14 -05:00
Sage Weil
96face6e8c Merge pull request #7928 from branch-predictor/bp-radostool-reduce-mem 
tools/rados: reduce "rados put" memory usage by op_size

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2016-03-09 15:02:00 -05:00
Sage Weil
af5d1b1aaf Merge pull request #7967 from tchaikov/wip-si-cast-coverity 
common/strtol.cc: fix the coverity warnings

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
 2016-03-09 15:01:31 -05:00
Sage Weil
42a9e65cc9 Merge pull request #7948 from avnerbh/fix_avoid_enqueue_dup_code 
msg: remove duplicated code - local_delivery will now call 'enqueue'

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
 2016-03-09 14:07:21 -05:00
Sage Weil
2b9775db2c Merge pull request #7890 from liewegas/wip-reweight 
mon: osd [test-]reweight-by-{pg,utilization} command updates

Reviewed-by: Samuel Just <sjust@redhat.com>
 2016-03-09 14:06:30 -05:00
Jason Dillaman
ca160372f4 pybind: flag an RBD Image as closed regardless of result code 
The image will always be closed -- the error code just alerts the
user to any possible error encountered when closing the image.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2016-03-09 13:56:16 -05:00
Jason Dillaman
a8e82a3809 librbd: permit watch flush to return error code 
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2016-03-09 13:55:29 -05:00
Sage Weil
661891aa28 mon: remove range=100 from reweight-by-* commands 
Specifying the range makes it skip instead of error when you give
it a bad value.

Signed-off-by: Sage Weil <sage@redhat.com>
 2016-03-09 13:25:55 -05:00
Sage Weil
8dcaacbb05 man/8/ceph-disk: fix formatting issue 
ERROR: /srv/autobuild-ceph/gitbuilder.git/build/doc/man/8/ceph-disk.rst:39: Unexpected indentation.
WARNING: /srv/autobuild-ceph/gitbuilder.git/build/doc/man/8/ceph-disk.rst:40: Block quote ends without a blank line; unexpected unindent.

Signed-off-by: Sage Weil <sage@redhat.com>
 2016-03-09 12:30:23 -05:00
Jason Dillaman
ed7906e59d test: update rbd integration cram tests for new default features 
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2016-03-09 11:42:16 -05:00