moonjuice/kernel_arpi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drbd: Allow volumes to become primary only on one side

Browse Source 
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
This commit is contained in:
Philipp Reisner
2011-03-16 14:43:36 +01:00
parent 40cbf085f5
commit 047e95e259
3 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/block/drbd/drbd_state.c
View File

@@ -329,6 +329,18 @@ static void print_state_change(struct drbd_conf *mdev, union drbd_state os, unio
dev_info(DEV, "%s\n", pb); dev_info(DEV, "%s\n", pb);
} }
static bool vol_has_primary_peer(struct drbd_tconn *tconn)
{
struct drbd_conf *mdev;
int minor;
idr_for_each_entry(&tconn->volumes, mdev, minor) {
if (mdev->state.peer == R_PRIMARY)
return true;
}
return false;
}
/** /**
* is_valid_state() - Returns an SS_ error code if ns is not valid * is_valid_state() - Returns an SS_ error code if ns is not valid
* @mdev: DRBD device. * @mdev: DRBD device.
@@ -349,9 +361,12 @@ is_valid_state(struct drbd_conf *mdev, union drbd_state ns)
} }
if (get_net_conf(mdev->tconn)) { if (get_net_conf(mdev->tconn)) {
if (!mdev->tconn->net_conf->two_primaries && if (!mdev->tconn->net_conf->two_primaries && ns.role == R_PRIMARY) {
ns.role == R_PRIMARY && ns.peer == R_PRIMARY) if (ns.peer == R_PRIMARY)
rv = SS_TWO_PRIMARIES; rv = SS_TWO_PRIMARIES;
else if (vol_has_primary_peer(mdev->tconn))
rv = SS_O_VOL_PEER_PRI;
}
put_net_conf(mdev->tconn); put_net_conf(mdev->tconn);
} }

1
drivers/block/drbd/drbd_strings.c
View File

@@ -89,6 +89,7 @@ static const char *drbd_state_sw_errors[] = {
[-SS_LOWER_THAN_OUTDATED] = "Disk state is lower than outdated", [-SS_LOWER_THAN_OUTDATED] = "Disk state is lower than outdated",
[-SS_IN_TRANSIENT_STATE] = "In transient state, retry after next state change", [-SS_IN_TRANSIENT_STATE] = "In transient state, retry after next state change",
[-SS_CONCURRENT_ST_CHG] = "Concurrent state changes detected and aborted", [-SS_CONCURRENT_ST_CHG] = "Concurrent state changes detected and aborted",
[-SS_O_VOL_PEER_PRI] = "Other vol primary on peer not allowed by config",
}; };
const char *drbd_conn_str(enum drbd_conns s) const char *drbd_conn_str(enum drbd_conns s)

3
include/linux/drbd.h
View File

@@ -300,7 +300,8 @@ enum drbd_state_rv {
SS_NOT_SUPPORTED = -17, /* drbd-8.2 only */ SS_NOT_SUPPORTED = -17, /* drbd-8.2 only */
SS_IN_TRANSIENT_STATE = -18, /* Retry after the next state change */ SS_IN_TRANSIENT_STATE = -18, /* Retry after the next state change */
SS_CONCURRENT_ST_CHG = -19, /* Concurrent cluster side state change! */ SS_CONCURRENT_ST_CHG = -19, /* Concurrent cluster side state change! */
SS_AFTER_LAST_ERROR = -20, /* Keep this at bottom */ SS_O_VOL_PEER_PRI = -20,
SS_AFTER_LAST_ERROR = -21, /* Keep this at bottom */
}; };
/* from drbd_strings.c */ /* from drbd_strings.c */