diff options
| author |   Jeff Layton <jlayton@redhat.com> | 2017-04-18 09:21:16 -0400 |
|---|---|---|
| committer |   Ilya Dryomov <idryomov@gmail.com> | 2017-05-04 09:19:21 +0200 |
| commit | 58eb7932ae4d671d2a2377a1779eda96a2789b11 (patch) | |
| tree | 86596efc2d33230b40ee27244b7c1f73903d4cc9 /net/ceph/debugfs.c | |
| parent | libceph: abort already submitted but abortable requests when map or pool goes full (diff) | |
| download | linux-dev-58eb7932ae4d671d2a2377a1779eda96a2789b11.tar.xz linux-dev-58eb7932ae4d671d2a2377a1779eda96a2789b11.zip | |
libceph: add an epoch_barrier field to struct ceph_osd_client
Cephfs can get cap update requests that contain a new epoch barrier in
them. When that happens we want to pause all OSD traffic until the right
map epoch arrives.
Add an epoch_barrier field to ceph_osd_client that is protected by the
osdc->lock rwsem. When the barrier is set, and the current OSD map
epoch is below that, pause the request target when submitting the
request or when revisiting it. Add a way for upper layers (cephfs)
to update the epoch_barrier as well.
If we get a new map, compare the new epoch against the barrier before
kicking requests and request another map if the map epoch is still lower
than the one we want.
If we get a map with a full pool, or at quota condition, then set the
barrier to the current epoch value.
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Diffstat (limited to 'net/ceph/debugfs.c')
| -rw-r--r-- | net/ceph/debugfs.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ceph/debugfs.c b/net/ceph/debugfs.c index d7e63a4f5578..71ba13927b3d 100644 --- a/net/ceph/debugfs.c +++ b/net/ceph/debugfs.c @@ -62,7 +62,8 @@ static int osdmap_show(struct seq_file *s, void *p) return 0; down_read(&osdc->lock); - seq_printf(s, "epoch %d flags 0x%x\n", map->epoch, map->flags); + seq_printf(s, "epoch %u barrier %u flags 0x%x\n", map->epoch, + osdc->epoch_barrier, map->flags); for (n = rb_first(&map->pg_pools); n; n = rb_next(n)) { struct ceph_pg_pool_info *pi = |