Commit af87f9a5 authored by jan.koester's avatar jan.koester
Browse files

test

parent 69540466

include/storaged/api.h

+2 −1
Changes for include/storaged/api.h: 2 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -75,7 +75,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
 *                                       onto a spare (with: this free

 *                                       device, added first, confirm) while

 *                                       it keeps working; then md fails it

 *                                       and RemoveMember takes it out

 *                                       and RemoveMember takes it out. Not

 *                                       on a degraded array (AddSpare)

 *   CheckArray {array, repair?, stop?}  scrub (sync_action check, repair

 *                                       rewrites mismatches, stop: idle)

 *   StopArray {array}                   members keep their superblocks

src/raid.cpp

+4 −0
Changes for src/raid.cpp: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -1028,6 +1028,10 @@ Result replace(const sysbus::Message &a) { 
        return fail(tr("%1 isn't a working member of %2", "%1 ist kein arbeitendes Mitglied von %2", {dev, arr.name}), 404);

    if (m->state.find("want_replacement") != std::string::npos)

        return fail(tr("%1 is already being replaced", "%1 wird bereits ersetzt", {dev}), 409);

    // md would rebuild the missing member onto the spare first

    if (arr.degraded > 0)

        return fail(tr("%1 is degraded: add a device first, it takes the missing place", "%1 ist beeinträchtigt: zuerst ein Gerät hinzufügen, es übernimmt den fehlenden Platz",

                       {arr.name}), 409);

    if (arr.syncAction != "idle")

        return fail(tr("%1 is busy (%2); wait until it is done", "%1 ist beschäftigt (%2); bitte warten, bis das fertig ist",

                       {arr.name, arr.syncAction}), 409);