mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-05-14 09:11:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Fixed applyConfiguration() to apply a full config in -ForceConfig mode

Browse Source 
- Fixed device handler switches
- Fixed device assignment LUN changes
- Fixed handling of disabled handlers (like dev_disk, dev_cdrom, etc from compile time)



git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@134 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Mark Buechler
2007-06-22 18:23:12 +00:00
parent 8de9a09bcf
commit 5a261fcdd6
3 changed files with 102 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scstadmin/Changes
View File

@@ -28,4 +28,8 @@ Changes since 0.9.6-pre2:
- Fixed applyConfiguration() to remove entries before adding new ones.
- Fixed changes and differences counts
- Added intelligence around virtual/physical/performance type devices
- Fixed applyConfiguration() to apply a full config even in -ForceConfig mode
- Fixed device handler switches
- Fixed device assignment LUN changes
- Fixed handling of disabled handlers (like dev_disk, dev_cdrom, etc from compile time)
- Minor bug fixes

35
scstadmin/SCST/SCST.pm
View File

@@ -57,7 +57,7 @@ $IOTYPE_PHYSICAL = 100;
$IOTYPE_VIRTUAL = 101;
$IOTYPE_PERFORMANCE = 102;
$VERSION = 0.7;
$VERSION = 0.7.1;
my $_SCST_MIN_MAJOR_ = 0;
my $_SCST_MIN_MINOR_ = 9;
@@ -87,6 +87,18 @@ my %_TYPE_MAP_ = ('dev_cdrom' => $CDROM_TYPE,
'dev_tape_perf' => $TAPEPERF_TYPE,
'dev_processor' => $PROCESSOR_TYPE);
my %_REVERSE_MAP_ = ($CDROM_TYPE => 'dev_cdrom',
$CHANGER_TYPE => 'dev_changer',
$DISK_TYPE => 'dev_disk',
$VDISK_TYPE => 'vdisk',
$VCDROM_TYPE => 'vcdrom',
$DISKPERF_TYPE => 'dev_disk_perf',
$MODISK_TYPE => 'dev_modisk',
$MODISKPERF_TYPE => 'dev_modisk_perf',
$TAPE_TYPE => 'dev_tape',
$TAPEPERF_TYPE => 'dev_tape_perf',
$PROCESSOR_TYPE => 'dev_processor');
my %_IO_TYPES_ = ($CDROM_TYPE => $IOTYPE_PHYSICAL,
$CHANGER_TYPE => $IOTYPE_PHYSICAL,
$DISK_TYPE => $IOTYPE_PHYSICAL,
@@ -349,8 +361,8 @@ sub handlerDevices {
my $io = new IO::File $handler_io, O_RDONLY;
if (!$io) {
$self->{'error'} = "handlerDevices(): Failed to open handler IO $handler_io";
return undef;
print "WARNING: handlerDevices(): Failed to open handler IO $handler_io, assuming disabled.\n";
return \%devices; # Return an empty hash
}
while (my $line = <$io>) {
@@ -753,24 +765,25 @@ sub assignDeviceToHandler {
my $device = shift;
my $handler = shift;
my $handler_io = $_IO_MAP_{$handler};
my $_handler = $_REVERSE_MAP_{$handler};
if (!$handler_io) {
$self->{'error'} = "assignDeviceToHandler(): Failed to open handler IO $handler_io or ".
"handler $handler invalid";
"handler $_handler($handler) invalid";
return $TRUE;
}
if (!$self->handlerExists($handler)) {
$self->{'error'} = "assignDeviceToHandler(): Handler $handler does not exist";
$self->{'error'} = "assignDeviceToHandler(): Handler $_handler does not exist";
return $TRUE;
}
if ($self->handlerDeviceExists($device, $handler)) {
$self->{'error'} = "assignDeviceToHandler(): Device $device is already assigned to handler $handler";
if ($self->handlerDeviceExists($handler, $device)) {
$self->{'error'} = "assignDeviceToHandler(): Device $device is already assigned to handler $_handler";
return 2;
}
my $cmd = "assign $device $handler\n";
my $cmd = "assign $device $_handler\n";
my $rc = $self->scst_private($cmd);
@@ -781,7 +794,7 @@ sub assignDeviceToHandler {
if ($rc) {
$self->{'error'} = "assignDeviceToHandler(): An error occured while assigning device $device ".
"to handler $handler. See dmesg/kernel log for more information.";
"to handler $_handler. See dmesg/kernel log for more information.";
}
return $rc;
@@ -850,8 +863,8 @@ sub handler_private {
my $io = new IO::File $handler_io, O_WRONLY;
if (!$io) {
$self->{'error'} = "SCST/SCST.pm: Failed to open handler IO $handler_io";
return $TRUE;
print "WARNING: SCST/SCST.pm: Failed to open handler IO $handler_io, assuming disabled.\n";
return $FALSE;
}
if ($self->{'debug'}) {

110
scstadmin/scstadmin
View File

@@ -1,5 +1,5 @@
#!/usr/bin/perl
$Version = 'SCST Configurator v0.7';
$Version = 'SCST Configurator v0.7.1';
# Configures SCST
#
@@ -326,7 +326,7 @@ sub main {
$SCST = new SCST::SCST($_DEBUG_);
readCurrentConfig();
readWorkingConfig();
SWITCH: {
$applyConfig && do {
@@ -338,6 +338,7 @@ sub main {
sleep 10;
}
readWorkingConfig();
$rc = applyConfiguration($applyConfig, $forceConfig, $FALSE);
last SWITCH;
};
@@ -418,9 +419,15 @@ sub main {
exit $rc;
}
sub readCurrentConfig {
sub readWorkingConfig {
print "Collecting current configuration.. ";
$TARGETS = undef;
$DEVICES = undef;
%HANDLERS = ();
%GROUPS = ();
%USERS = ();
my $eHandlers = $SCST->handlers();
immediateExit($SCST->errorString());
@@ -438,7 +445,7 @@ sub readCurrentConfig {
immediateExit($SCST->errorString());
foreach my $group (@{$_eGroups}) {
$GROUPS{$group}++; # For quick lookups
$GROUPS{$group}++;
$ASSIGNMENTS{$group} = $SCST->groupDevices($group);
my $eUsers = $SCST->users($group);
@@ -447,7 +454,7 @@ sub readCurrentConfig {
}
}
print "done.\n";
print "done.\n\n";
}
sub writeConfiguration {
@@ -474,10 +481,18 @@ sub writeConfiguration {
# Device information
foreach my $handler (sort keys %HANDLERS) {
next if ($SCST->handlerType($handler) != $SCST::SCST::IOTYPE_VIRTUAL);
print $io "[HANDLER ".$_REVERSE_MAP_{$handler}."]\n";
print $io "#DEVICE <vdisk name>,<device path>,<options>,<block size>\n";
if ($SCST->handlerType($handler) == $SCST::SCST::IOTYPE_VIRTUAL) {
print $io "#DEVICE <vdisk name>,<device path>";
if ($handler == $SCST::SCST::VDISK_TYPE) {
print $io ",<options>,<block size>\n";
} else {
print $io "\n";
}
} else {
print $io "#DEVICE <H:C:I:L>\n";
}
my $devices = $SCST->handlerDevices($handler);
@@ -586,7 +601,7 @@ sub applyConfiguration {
# Associations
foreach my $group (sort keys %ASSIGNMENTS) {
if (!defined($used_assignments{$group}) && (keys %{$ASSIGNMENTS{$group}})) {
print "\tWARNING: Group $group has no associations in saved configuration";
print "\t-> WARNING: Group '$group' has no associations in saved configuration";
if (!$check) {
print ", clearing all associations.\n";
@@ -603,9 +618,16 @@ sub applyConfiguration {
my $_assignments = $ASSIGNMENTS{$group};
foreach my $device (sort keys %{$_assignments}) {
if (!defined($used_assignments{$group}->{$device})) {
print "\tWARNING: Device $device is not associated with group ".
"$group in saved configuration";
if (!defined($used_assignments{$group}->{$device}) ||
($$_assignments{$device} != $used_assignments{$group}->{$device})) {
if ($$_assignments{$device} != $used_assignments{$group}->{$device}) {
print "\t-> WARNING: Device '$device' assigned to group '$group' is at LUN ".
$used_assignments{$group}->{$device}.
" whereas working configuration reflects LUN ".$$_assignments{$device};
} else {
print "\t-> WARNING: Device '$device' is not associated with group ".
"'$group' in saved configuration";
}
if (!$check) {
print ", releasing.\n";
@@ -626,7 +648,7 @@ sub applyConfiguration {
# Users & Groups
foreach my $group (sort keys %USERS) {
if (!defined($used_users{$group})) {
print "\tWARNING: Group $group does not exist in saved configuration";
print "\t-> WARNING: Group '$group' does not exist in saved configuration";
if (!$check) {
print ", removing.\n";
@@ -648,7 +670,7 @@ sub applyConfiguration {
} else {
foreach my $user (sort keys %{$USERS{$group}}) {
if (!defined($used_users{$group}->{$user})) {
print "\WARNING: User $user is not defined as part of group $group ".
print "\t-> WARNING: User '$user' is not defined as part of group '$group' ".
"in saved configuration";
if (!$check) {
@@ -669,21 +691,19 @@ sub applyConfiguration {
# Devices
foreach my $device (sort keys %{$DEVICES}) {
next if ($SCST->handlerType($$DEVICES{$device}) != $SCST::SCST::IOTYPE_VIRTUAL);
if ($$DEVICES{$device} && !defined($used_devs{$device})) {
# Device gone, but is it still assigned to a group?
my $isAssigned = $FALSE;
foreach my $group (sort keys %used_assignments) {
if (defined($used_assignments{$group}->{$device})) {
print "\tWARNING: Device $device is not defined in saved configuration, ".
"however, it is still assigned to group $group! Ignoring removal.\n";
print "\t-> WARNING: Device '$device' is not defined in saved configuration, ".
"however, it is still assigned to group '$group'! Ignoring removal.\n";
$isAssigned = $TRUE;
}
}
if (!$isAssigned) {
print "\tWARNING: Device $device is not defined in saved configuration";
if (!$isAssigned && ($SCST->handlerType($$DEVICES{$device}) == $SCST::SCST::IOTYPE_VIRTUAL)) {
print "\t-> WARNING: Device '$device' is not defined in saved configuration";
if (!$check) {
print ", removing.\n";
@@ -703,11 +723,12 @@ sub applyConfiguration {
my $handler = $used_devs{$device};
if ($HANDLERS{$_HANDLER_MAP_{$handler}}) {
print "\tWARNING: Device $device changes handler to $handler";
print "\t-> WARNING: Device '$device' changes handler to '$handler'";
if (!$check) {
print ", changing.\n";
if (assignDeviceToHandler($device, $handler)) {
if ($SCST->assignDeviceToHandler($device,
$_HANDLER_MAP_{$handler})) {
$errs++;
} else {
$changes++;
@@ -725,7 +746,7 @@ sub applyConfiguration {
print "Applying configurations additions..\n" if (!$check);
print "\n";
readCurrentConfig() if ($force);
readWorkingConfig() if ($force);
foreach my $vname (keys %used_devs) {
my $_handler = $used_devs{$vname};
@@ -741,10 +762,20 @@ sub applyConfiguration {
$path = cleanupString($path);
$options =~ s/\s+//; $options =~ s/\|/,/;
next if (defined($$DEVICES{$vname}));
if (defined($$DEVICES{$vname}) && ($_HANDLER_MAP_{$_handler} == $$DEVICES{$vname})) {
next;
} elsif (defined($$DEVICES{$vname}) && ($_HANDLER_MAP_{$_handler} != $$DEVICES{$vname})) {
if ($HANDLERS{$_HANDLER_MAP_{$_handler}}) {
print "\t-> WARNING: Device '$vname' changes handler from '".
$_REVERSE_MAP_{$$DEVICES{$vname}}."' to '$_handler'.\n".
"\t Use -ForceConfig to change device handler.\n" if (!$force && !$check);
}
next;
}
if ($check) {
print "\t-> New device '$_handler:$vname' at path '$path', options '$options', blocksize $blocksize.\n";
print "\t-> New device '$_handler:$vname' at path '$path', options '$options', ".
"blocksize $blocksize.\n";
$$DEVICES{$vname} = $_HANDLER_MAP_{$_handler};
$changes++;
} else {
@@ -759,7 +790,7 @@ sub applyConfiguration {
# Create new groups and add users..
foreach my $group (keys %used_users) {
if (!defined($GROUPS{$group})) {
if (!defined($USERS{$group})) {
if ($check) {
print "\t-> New group definition '$group.'\n";
$GROUPS{$group}++;
@@ -801,17 +832,24 @@ sub applyConfiguration {
foreach my $vname (keys %{$used_assignments{$group}}) {
my $lun = $used_assignments{$group}->{$vname};
my $_assignments = $ASSIGNMENTS{$group};
next if (defined($$_assignments{$vname}));
if ($check) {
$lun = 'auto' if (!defined($lun));
print "\t-> New device assignment for '$vname' to group '$group' at LUN $lun.\n";
$changes++;
if (defined($$_assignments{$vname}) && ($$_assignments{$vname} == $lun)) {
next;
} elsif (defined($$_assignments{$vname}) && ($$_assignments{$vname} != $lun)) {
print "\t-> Device '$vname' assigned to group '$group' is at LUN ".$$_assignments{$vname}.
", whereas the working configuration reflects LUN $lun.\n".
"\t Use -ForceConfig to force this LUN change.\n" if (!$force && !$check);
} else {
if (assignDevice($group, $vname, $lun)) {
$errs++;
} else {
if ($check) {
$lun = 'auto' if (!defined($lun));
print "\t-> New device assignment for '$vname' to group '$group' at LUN $lun.\n";
$changes++;
} else {
if (assignDevice($group, $vname, $lun)) {
$errs++;
} else {
$changes++;
}
}
}
}
@@ -844,7 +882,7 @@ sub applyConfiguration {
if (!$enable && targetEnabled($target)) {
if ($force || $check) {
print "\tWARNING: Target mode for '$target' is currently enabled, ".
print "\t-> WARNING: Target mode for '$target' is currently enabled, ".
"however configuration file wants it disabled";
if (!$check) {
@@ -881,7 +919,7 @@ sub applyConfiguration {
print "\nEncountered $errs error(s) while processing.\n" if ($errs);
if ($check) {
print "Configuration checked, $changes difference(s) found with current configuration.\n";
print "Configuration checked, $changes difference(s) found with working configuration.\n";
} else {
$changes = 0 if ($_DEBUG_);
print "Configuration applied, $changes changes made.\n";