mirror of
https://github.com/ibm-s390-linux/s390-tools.git
synced 2026-08-05 02:14:52 +00:00
ziomon/ziorep_config: fix for SCSI devices of type disk without block dev
If system configuration contains zfcp-attached SCSI devices of Peripheral Device Type disk, but without block device, e.g. because the storage reports Peripheral Qualifier 1 in INQUIRY, ziorep_config tool issue the following type of errors during generation of .config file from .cfg file: $ ziorep_config -I -i test.cfg Unpacking configuration ...Done. Use of uninitialized value in subroutine entry at /usr/sbin/ziorep_config line 36. Use of uninitialized value in subroutine entry at /usr/sbin/ziorep_config line 36. Use of uninitialized value in subroutine entry at /usr/sbin/ziorep_config line 54. Use of uninitialized value in subroutine entry at /usr/sbin/ziorep_config line 135. ... Such errors can also be seen during printing of adapter, device and map reports: $ ziorep_config -ADM -i test.cfg Unpacking configuration ...Done. Use of uninitialized value in subroutine entry at /usr/sbin/ziorep_config line 36. Use of uninitialized value in subroutine entry at /usr/sbin/ziorep_config line 36. Use of uninitialized value in subroutine entry at /usr/sbin/ziorep_config line 54. Use of uninitialized value in subroutine entry at /usr/sbin/ziorep_config line 135. ... This is because ziorep_config reads block device parameters from non-existent block device subdirectory. And therefore ziorep_config leaves block device major:minor number column empty in .config file instead of filling it with 0:0 preset value afterwards. As a consequence, ziorep_traffic tool, which is using .config file to get information about devices, reports the following error: $ ziorep_traffic test Extracting config data...done ziorep_traffic: Could not parse line 1 - configuration file broken? To fix this, skip reading the block device parameters for such devices, and use the preset values that have been set before instead. Signed-off-by: Fedor Loshakov <loshakov@linux.ibm.com> Suggested-by: Steffen Maier <maier@linux.ibm.com> Reviewed-by: Benjamin Block <bblock@linux.ibm.com> Reviewed-by: Steffen Maier <maier@linux.ibm.com> Signed-off-by: Jan Höppner <hoeppner@linux.ibm.com>
This commit is contained in:
committed by
Jan Höppner
parent
46c291835f
commit
a92ee5ba8d
@@ -124,6 +124,7 @@ sub get_device_data
|
||||
$devices{$hctl}{dev} = glob_last("block\:sd*");
|
||||
}
|
||||
$devices{$hctl}{sg_mm} = get_line("generic", "dev");
|
||||
next if !defined $devices{$hctl}{dev};
|
||||
$c_src = $devices{$hctl}{dev};
|
||||
$devices{$hctl}{dev} =~ s/.*(sd[a-z0-9]+)\Z/$1/
|
||||
unless(!$devices{$hctl}{dev});
|
||||
|
||||
Reference in New Issue
Block a user