Commit Graph

51081 Commits

Author SHA1 Message Date
John Spray
0ed5eb7a8e tools/cephfs: update for FSMap
Everywhere we used to take a rank, we now
take a role (<fscid:rank>)

Signed-off-by: John Spray <john.spray@redhat.com>
2016-03-10 12:11:23 +00:00
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
Piotr Dałek
7a461a43ad common/obj_bencher.cc: bump the precision of bandwidth field
When calculated final average bandwidth exceeds 999MB, it starts
to get printed in scientific notation. Bump up the bandwidth
field precision so it'll remain in floating-point format for
a bit longer.

Signed-off-by: Piotr Dałek <piotr.dalek@ts.fujitsu.com>
2016-03-10 12:50:47 +01: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
Mykola Golub
23e72e4b54 librbd: make journal start_external_replay not block
Its caller shall check the journal is in right state.

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2016-03-10 11:11:14 +02:00
Mykola Golub
3fb515291f journal: provide method to check if journaler initialized
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2016-03-10 11:11:07 +02: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
Karol Mroz
e3d8d65f16 rgw: instruct civetweb to drop permissions
Get uid set in g_ceph_context and pass to civetweb where setuid()/setgid()
will be invoked. This Allows for starting civetweb under privileged port
numbers.

Fixes: #13600

Signed-off-by: Karol Mroz <kmroz@suse.com>
2016-03-10 09:33:16 +01:00
Karol Mroz
422c749b84 rgw_main: break up frontend config parsing
Before invoking global_init(), determine which frontends are configured.
If Civetweb is to be used, ensure it will be responsible for dropping
permissions after radosgw startup.

Signed-off-by: Karol Mroz <kmroz@suse.com>
2016-03-10 09:33:16 +01:00
Karol Mroz
f50c332bcb global_init: add run_pre_init argument to function signature
Allows running the global_pre_init() separately in order to parse config
options prior to invoking global_init().

Signed-off-by: Karol Mroz <kmroz@suse.com>
2016-03-10 09:33:16 +01:00
Karol Mroz
c218c53d1a global: record target user and group strings
Useful so we don't have to do a reverse lookup when dropping permissions
in civetweb.

Signed-off-by: Karol Mroz <kmroz@suse.com>
2016-03-10 09:33:16 +01: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
RustShen
5fe3ff3f09 Modifications to rbd-openstack.rst
Original configuration is not working

'enabled_backends' should be changed accordingly

Signed-off-by: RustShen <rustinpeace@163.com>

Update rbd-openstack.rst
2016-03-10 14:31:34 +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
Yehuda Sadeh
93be4c6e34 rgw_admin: minor output cleanups
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2016-03-09 17:02:34 -08:00
Yehuda Sadeh
3d58c14cc5 rgw: silence some noisy log messages
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2016-03-09 17:02:33 -08:00
Yehuda Sadeh
453bc556b6 rgw_admin: report oldest data not synced
in radosgw-admin sync status

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2016-03-09 17:02:33 -08:00
Yehuda Sadeh
eea64de61c rgw_admin: show more data sync info
in radosgw-admin sync status command

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2016-03-09 17:02:33 -08:00
Yehuda Sadeh
03f8e624d9 rgw_admin: show oldest metadata change not applied
in radosgw-admin sync status

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2016-03-09 17:02:33 -08:00
Yehuda Sadeh
b15f1ec195 rgw_admin: a command to show sync status
show it in a human readable way

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2016-03-09 17:02:32 -08: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