diff options
| author | David Zafman <david.zafman@inktank.com> | 2013-05-10 16:44:19 -0700 |
|---|---|---|
| committer | David Zafman <david.zafman@inktank.com> | 2013-05-10 16:45:34 -0700 |
| commit | ea0e0c7e34f6b99ecb123d0ee761f653e7e6bc04 (patch) | |
| tree | 2df957c71bf1d6f13b8fc0f1bbb9244e11e27048 /src/osd/OSD.h | |
| parent | 7b408537c4986153a54dc090f8872f72904f5d4d (diff) | |
| parent | 00e903160b33fe0a2195fe9c86ed24350944bdea (diff) | |
| download | ceph-ea0e0c7e34f6b99ecb123d0ee761f653e7e6bc04.tar.gz | |
Merge branch 'wip-4273'
Reviewed-by: Sam Just <sam.just@inktank.com>
Diffstat (limited to 'src/osd/OSD.h')
| -rw-r--r-- | src/osd/OSD.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/osd/OSD.h b/src/osd/OSD.h index 509adee803b..d20c9b1268e 100644 --- a/src/osd/OSD.h +++ b/src/osd/OSD.h @@ -382,6 +382,11 @@ public: } // -- backfill_reservation -- + enum { + BACKFILL_LOW = 0, // backfill non-degraded PGs + BACKFILL_HIGH = 1, // backfill degraded PGs + RECOVERY = AsyncReserver<pg_t>::MAX_PRIORITY // log based recovery + }; Finisher reserver_finisher; AsyncReserver<pg_t> local_reserver; AsyncReserver<pg_t> remote_reserver; @@ -1319,7 +1324,6 @@ protected: void start_recovery_op(PG *pg, const hobject_t& soid); void finish_recovery_op(PG *pg, const hobject_t& soid, bool dequeue); - void defer_recovery(PG *pg); void do_recovery(PG *pg); bool _recover_now(); |