Update Proxmox VE patches to 5.3-6
- Updated ZFSPlugin.pm.patch for libpve-storage-perl: 5.3-34 - Updated pvemanagerlib.js.patch for pve-manager: 5.3-6 - Patch file versions will now have a '_<#>' (e.g. 5.3-34_1) appended to it denoting the patch version for that Proxmox VE lib/file version.
This commit is contained in:
Kevin Scott Adams
parent
5e255a6208
commit
d0efcd49c5
|
|
@ -0,0 +1,147 @@
|
|||
--- ZFSPlugin-5.0-34.pm 2018-12-21 12:52:21.764194866 -0500
|
||||
+++ ZFSPlugin.pm 2018-12-21 12:53:08.663665081 -0500
|
||||
@@ -10,6 +10,7 @@
|
||||
|
||||
use base qw(PVE::Storage::ZFSPoolPlugin);
|
||||
use PVE::Storage::LunCmd::Comstar;
|
||||
+use PVE::Storage::LunCmd::FreeNAS;
|
||||
use PVE::Storage::LunCmd::Istgt;
|
||||
use PVE::Storage::LunCmd::Iet;
|
||||
use PVE::Storage::LunCmd::LIO;
|
||||
@@ -26,13 +27,14 @@
|
||||
modify_lu => 1,
|
||||
add_view => 1,
|
||||
list_view => 1,
|
||||
+ list_extent => 1,
|
||||
list_lu => 1,
|
||||
};
|
||||
|
||||
my $zfs_unknown_scsi_provider = sub {
|
||||
my ($provider) = @_;
|
||||
|
||||
- die "$provider: unknown iscsi provider. Available [comstar, istgt, iet, LIO]";
|
||||
+ die "$provider: unknown iscsi provider. Available [comstar, freenas, istgt, iet, LIO]";
|
||||
};
|
||||
|
||||
my $zfs_get_base = sub {
|
||||
@@ -40,6 +42,8 @@
|
||||
|
||||
if ($scfg->{iscsiprovider} eq 'comstar') {
|
||||
return PVE::Storage::LunCmd::Comstar::get_base;
|
||||
+ } elsif ($scfg->{iscsiprovider} eq 'freenas') {
|
||||
+ return PVE::Storage::LunCmd::FreeNAS::get_base;
|
||||
} elsif ($scfg->{iscsiprovider} eq 'istgt') {
|
||||
return PVE::Storage::LunCmd::Istgt::get_base;
|
||||
} elsif ($scfg->{iscsiprovider} eq 'iet') {
|
||||
@@ -62,6 +66,8 @@
|
||||
if ($lun_cmds->{$method}) {
|
||||
if ($scfg->{iscsiprovider} eq 'comstar') {
|
||||
$msg = PVE::Storage::LunCmd::Comstar::run_lun_command($scfg, $timeout, $method, @params);
|
||||
+ } elsif ($scfg->{iscsiprovider} eq 'freenas') {
|
||||
+ $msg = PVE::Storage::LunCmd::FreeNAS::run_lun_command($scfg, $timeout, $method, @params);
|
||||
} elsif ($scfg->{iscsiprovider} eq 'istgt') {
|
||||
$msg = PVE::Storage::LunCmd::Istgt::run_lun_command($scfg, $timeout, $method, @params);
|
||||
} elsif ($scfg->{iscsiprovider} eq 'iet') {
|
||||
@@ -160,6 +166,15 @@
|
||||
return $class->zfs_request($scfg, undef, 'list_view', $guid);
|
||||
}
|
||||
|
||||
+# Part of the multipath enhancement
|
||||
+sub zfs_get_wwid_number {
|
||||
+ my ($class, $scfg, $guid) = @_;
|
||||
+
|
||||
+ die "could not find lun_number for guid $guid" if !$guid;
|
||||
+
|
||||
+ return $class->zfs_request($scfg, undef, 'list_extent', $guid);
|
||||
+}
|
||||
+
|
||||
# Configuration
|
||||
|
||||
sub type {
|
||||
@@ -178,6 +193,24 @@
|
||||
description => "iscsi provider",
|
||||
type => 'string',
|
||||
},
|
||||
+ # This is for FreeNAS iscsi and API intergration
|
||||
+ # And some enhancements asked by the community
|
||||
+ freenas_user => {
|
||||
+ description => "FreeNAS API Username",
|
||||
+ type => 'string',
|
||||
+ },
|
||||
+ freenas_password => {
|
||||
+ description => "FreeNAS API Password",
|
||||
+ type => 'string',
|
||||
+ },
|
||||
+ freenas_use_ssl => {
|
||||
+ description => "FreeNAS API access via SSL",
|
||||
+ type => 'boolean',
|
||||
+ },
|
||||
+ freenas_apiv4_host => {
|
||||
+ description => "FreeNAS API Host",
|
||||
+ type => 'string',
|
||||
+ },
|
||||
# this will disable write caching on comstar and istgt.
|
||||
# it is not implemented for iet. iet blockio always operates with
|
||||
# writethrough caching when not in readonly mode
|
||||
@@ -205,14 +238,18 @@
|
||||
nodes => { optional => 1 },
|
||||
disable => { optional => 1 },
|
||||
portal => { fixed => 1 },
|
||||
- target => { fixed => 1 },
|
||||
- pool => { fixed => 1 },
|
||||
+ target => { fixed => 0 },
|
||||
+ pool => { fixed => 0 },
|
||||
blocksize => { fixed => 1 },
|
||||
iscsiprovider => { fixed => 1 },
|
||||
nowritecache => { optional => 1 },
|
||||
sparse => { optional => 1 },
|
||||
comstar_hg => { optional => 1 },
|
||||
comstar_tg => { optional => 1 },
|
||||
+ freenas_user => { optional => 1 },
|
||||
+ freenas_password => { optional => 1 },
|
||||
+ freenas_use_ssl => { optional => 1 },
|
||||
+ freenas_apiv4_host => { optional => 1 },
|
||||
lio_tpg => { optional => 1 },
|
||||
content => { optional => 1 },
|
||||
bwlimit => { optional => 1 },
|
||||
@@ -237,6 +274,40 @@
|
||||
|
||||
my $path = "iscsi://$portal/$target/$lun";
|
||||
|
||||
+ # Multipath enhancement
|
||||
+ eval {
|
||||
+ my $wwid = $class->zfs_get_wwid_number($scfg, $guid);
|
||||
+# syslog(info,"JD: path get_lun_number guid $guid");
|
||||
+
|
||||
+ if ($wwid =~ /^([-\@\w.]+)$/) {
|
||||
+ $wwid = $1; # $data now untainted
|
||||
+ } else {
|
||||
+ die "Bad data in '$wwid'"; # log this somewhere
|
||||
+ }
|
||||
+ my $wwid_end = substr $wwid, 16;
|
||||
+
|
||||
+ my $mapper = '';
|
||||
+ sleep 3;
|
||||
+ run_command("iscsiadm -m session --rescan");
|
||||
+ sleep 3;
|
||||
+ my $line = `multipath -ll | grep \"$wwid_end\"`;
|
||||
+ my ($mapper_device) = split(' ', $line);
|
||||
+ $mapper_device = "" unless $mapper_device;
|
||||
+ $mapper .= $mapper_device;
|
||||
+
|
||||
+ if ($mapper =~ /^([-\@\w.]+)$/) {
|
||||
+ $mapper = $1; # $data now untainted
|
||||
+ } else {
|
||||
+ $mapper = '';
|
||||
+ }
|
||||
+
|
||||
+# syslog(info,"Multipath mapper found: $mapper\n");
|
||||
+ if ($mapper ne "") {
|
||||
+ $path = "/dev/mapper/$mapper";
|
||||
+ sleep 5;
|
||||
+ }
|
||||
+ };
|
||||
+
|
||||
return ($path, $vmid, $vtype);
|
||||
}
|
||||
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
--- ZFSPlugin.pm.orig 2018-11-27 07:23:15.000000000 -0500
|
||||
+++ ZFSPlugin.pm 2018-12-15 09:24:08.393984276 -0500
|
||||
--- ZFSPlugin-5.0-34.pm 2018-12-21 12:52:21.764194866 -0500
|
||||
+++ ZFSPlugin.pm 2018-12-21 12:53:08.663665081 -0500
|
||||
@@ -10,6 +10,7 @@
|
||||
|
||||
use base qw(PVE::Storage::ZFSPoolPlugin);
|
||||
|
|
|
|||
|
|
@ -0,0 +1,172 @@
|
|||
--- pvemanagerlib-5.3-6.js 2018-12-21 12:54:58.650421078 -0500
|
||||
+++ pvemanagerlib.js 2018-12-21 12:55:25.170120836 -0500
|
||||
@@ -5894,6 +5894,7 @@
|
||||
alias: ['widget.pveiScsiProviderSelector'],
|
||||
comboItems: [
|
||||
['comstar', 'Comstar'],
|
||||
+ ['freenas', 'FreeNAS-API'],
|
||||
[ 'istgt', 'istgt'],
|
||||
[ 'iet', 'IET'],
|
||||
[ 'LIO', 'LIO']
|
||||
@@ -30085,6 +30086,7 @@
|
||||
data: {
|
||||
isLIO: false,
|
||||
isComstar: true,
|
||||
+ isFreeNAS: false,
|
||||
hasWriteCacheOption: true
|
||||
}
|
||||
},
|
||||
@@ -30097,10 +30099,19 @@
|
||||
}
|
||||
},
|
||||
changeISCSIProvider: function(f, newVal, oldVal) {
|
||||
+ var me = this;
|
||||
var vm = this.getViewModel();
|
||||
vm.set('isLIO', newVal === 'LIO');
|
||||
vm.set('isComstar', newVal === 'comstar');
|
||||
- vm.set('hasWriteCacheOption', newVal === 'comstar' || newVal === 'istgt');
|
||||
+ vm.set('isFreeNAS', newVal === 'freenas');
|
||||
+ vm.set('hasWriteCacheOption', newVal === 'comstar' || newVal === 'freenas' || newVal === 'istgt');
|
||||
+ if (newVal !== 'freenas') {
|
||||
+ me.lookupReference('freenas_use_ssl_field').setValue(false);
|
||||
+ me.lookupReference('freenas_apiv4_host_field').setValue('');
|
||||
+ me.lookupReference('freenas_user_field').setValue('');
|
||||
+ me.lookupReference('freenas_password_field').setValue('');
|
||||
+ me.lookupReference('freenas_confirmpw_field').setValue('');
|
||||
+ }
|
||||
}
|
||||
},
|
||||
|
||||
@@ -30118,6 +30129,7 @@
|
||||
},
|
||||
|
||||
setValues: function diff(values) {
|
||||
+ values.freenas_confirmpw = values.freenas_password;
|
||||
values.writecache = values.nowritecache ? 0 : 1;
|
||||
this.callParent([values]);
|
||||
},
|
||||
@@ -30134,7 +30146,7 @@
|
||||
allowBlank: false
|
||||
},
|
||||
{
|
||||
- xtype: me.isCreate ? 'textfield' : 'displayfield',
|
||||
+ xtype: 'textfield',
|
||||
name: 'pool',
|
||||
value: '',
|
||||
fieldLabel: gettext('Pool'),
|
||||
@@ -30144,11 +30156,11 @@
|
||||
xtype: me.isCreate ? 'textfield' : 'displayfield',
|
||||
name: 'blocksize',
|
||||
value: '4k',
|
||||
- fieldLabel: gettext('Block Size'),
|
||||
+ fieldLabel: gettext('ZFS Block Size'),
|
||||
allowBlank: false
|
||||
},
|
||||
{
|
||||
- xtype: me.isCreate ? 'textfield' : 'displayfield',
|
||||
+ xtype: 'textfield',
|
||||
name: 'target',
|
||||
value: '',
|
||||
fieldLabel: gettext('Target'),
|
||||
@@ -30159,8 +30171,28 @@
|
||||
name: 'comstar_tg',
|
||||
value: '',
|
||||
fieldLabel: gettext('Target group'),
|
||||
- bind: me.isCreate ? { disabled: '{!isComstar}' } : { hidden: '{!isComstar}' },
|
||||
+ bind: { hidden: '{!isComstar}' },
|
||||
allowBlank: true
|
||||
+ },
|
||||
+ {
|
||||
+ xtype: 'proxmoxcheckbox',
|
||||
+ name: 'freenas_use_ssl',
|
||||
+ reference: 'freenas_use_ssl_field',
|
||||
+ inputId: 'freenas_use_ssl_field',
|
||||
+ checked: false,
|
||||
+ bind: { hidden: '{!isFreeNAS}' },
|
||||
+ uncheckedValue: 0,
|
||||
+ fieldLabel: gettext('API use SSL')
|
||||
+ },
|
||||
+ {
|
||||
+ xtype: 'textfield',
|
||||
+ name: 'freenas_user',
|
||||
+ reference: 'freenas_user_field',
|
||||
+ inputId: 'freenas_user_field',
|
||||
+ value: '',
|
||||
+ allowBlank: false,
|
||||
+ fieldLabel: gettext('API Username'),
|
||||
+ bind: { hidden: '{!isFreeNAS}' },
|
||||
}
|
||||
];
|
||||
|
||||
@@ -30191,7 +30223,7 @@
|
||||
xtype: me.isCreate ? 'textfield' : 'displayfield',
|
||||
name: 'comstar_hg',
|
||||
value: '',
|
||||
- bind: me.isCreate ? { disabled: '{!isComstar}' } : { hidden: '{!isComstar}' },
|
||||
+ bind: { hidden: '{!isComstar}' },
|
||||
fieldLabel: gettext('Host group'),
|
||||
allowBlank: true
|
||||
},
|
||||
@@ -30199,9 +30231,60 @@
|
||||
xtype: me.isCreate ? 'textfield' : 'displayfield',
|
||||
name: 'lio_tpg',
|
||||
value: '',
|
||||
- bind: me.isCreate ? { disabled: '{!isLIO}' } : { hidden: '{!isLIO}' },
|
||||
+ bind: { hidden: '{!isLIO}' },
|
||||
+ fieldLabel: gettext('Target portal group'),
|
||||
+ allowBlank: true
|
||||
+ },
|
||||
+ {
|
||||
+ xtype: 'proxmoxtextfield',
|
||||
+ name: 'freenas_apiv4_host',
|
||||
+ reference: 'freenas_apiv4_host_field',
|
||||
+ value: '',
|
||||
+ editable: true,
|
||||
+ allowBlank: true,
|
||||
+ emptyText: Proxmox.Utils.noneText,
|
||||
+ bind: { hidden: '{!isFreeNAS}' },
|
||||
+ fieldLabel: gettext('API IPv4 Host'),
|
||||
+ allowBlank: true
|
||||
+ },
|
||||
+ {
|
||||
+ xtype: 'proxmoxtextfield',
|
||||
+ name: 'freenas_password',
|
||||
+ reference: 'freenas_password_field',
|
||||
+ inputType: me.isCreate ? '' : 'password',
|
||||
+ value: '',
|
||||
+ editable: true,
|
||||
+ deleteEmpty: true,
|
||||
+ allowBlank: false,
|
||||
+ emptyText: Proxmox.Utils.noneText,
|
||||
+ bind: { hidden: '{!isFreeNAS}' },
|
||||
+ fieldLabel: gettext('API Password'),
|
||||
+ change: function(f, value) {
|
||||
+ if (f.rendered) {
|
||||
+ f.up().down('field[name=freenas_confirmpw]').validate();
|
||||
+ }
|
||||
+ }
|
||||
+ },
|
||||
+ {
|
||||
+ xtype: 'proxmoxtextfield',
|
||||
+ name: 'freenas_confirmpw',
|
||||
+ reference: 'freenas_confirmpw_field',
|
||||
+ inputType: me.isCreate ? '' : 'password',
|
||||
+ value: '',
|
||||
+ editable: true,
|
||||
+ deleteEmpty: true,
|
||||
allowBlank: false,
|
||||
- fieldLabel: gettext('Target portal group')
|
||||
+ submitValue: false,
|
||||
+ emptyText: Proxmox.Utils.noneText,
|
||||
+ bind: { hidden: '{!isFreeNAS}' },
|
||||
+ fieldLabel: gettext('Confirm Password'),
|
||||
+ validator: function(value) {
|
||||
+ var pw = this.up().down('field[name=freenas_password]').getValue();
|
||||
+ if (pw !== value) {
|
||||
+ return "Passwords do not match!";
|
||||
+ }
|
||||
+ return true;
|
||||
+ }
|
||||
}
|
||||
];
|
||||
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
--- pvemanagerlib-5.3-5.js 2018-12-21 12:34:35.727962756 -0500
|
||||
+++ pvemanagerlib.js 2018-12-21 12:43:02.370462786 -0500
|
||||
@@ -5854,6 +5854,7 @@
|
||||
--- pvemanagerlib-5.3-6.js 2018-12-21 12:54:58.650421078 -0500
|
||||
+++ pvemanagerlib.js 2018-12-21 12:55:25.170120836 -0500
|
||||
@@ -5894,6 +5894,7 @@
|
||||
alias: ['widget.pveiScsiProviderSelector'],
|
||||
comboItems: [
|
||||
['comstar', 'Comstar'],
|
||||
|
|
@ -8,7 +8,7 @@
|
|||
[ 'istgt', 'istgt'],
|
||||
[ 'iet', 'IET'],
|
||||
[ 'LIO', 'LIO']
|
||||
@@ -29983,6 +29984,7 @@
|
||||
@@ -30085,6 +30086,7 @@
|
||||
data: {
|
||||
isLIO: false,
|
||||
isComstar: true,
|
||||
|
|
@ -16,7 +16,7 @@
|
|||
hasWriteCacheOption: true
|
||||
}
|
||||
},
|
||||
@@ -29995,10 +29997,19 @@
|
||||
@@ -30097,10 +30099,19 @@
|
||||
}
|
||||
},
|
||||
changeISCSIProvider: function(f, newVal, oldVal) {
|
||||
|
|
@ -37,7 +37,7 @@
|
|||
}
|
||||
},
|
||||
|
||||
@@ -30016,6 +30027,7 @@
|
||||
@@ -30118,6 +30129,7 @@
|
||||
},
|
||||
|
||||
setValues: function diff(values) {
|
||||
|
|
@ -45,7 +45,7 @@
|
|||
values.writecache = values.nowritecache ? 0 : 1;
|
||||
this.callParent([values]);
|
||||
},
|
||||
@@ -30032,7 +30044,7 @@
|
||||
@@ -30134,7 +30146,7 @@
|
||||
allowBlank: false
|
||||
},
|
||||
{
|
||||
|
|
@ -54,7 +54,7 @@
|
|||
name: 'pool',
|
||||
value: '',
|
||||
fieldLabel: gettext('Pool'),
|
||||
@@ -30042,11 +30054,11 @@
|
||||
@@ -30144,11 +30156,11 @@
|
||||
xtype: me.isCreate ? 'textfield' : 'displayfield',
|
||||
name: 'blocksize',
|
||||
value: '4k',
|
||||
|
|
@ -68,7 +68,7 @@
|
|||
name: 'target',
|
||||
value: '',
|
||||
fieldLabel: gettext('Target'),
|
||||
@@ -30057,8 +30069,28 @@
|
||||
@@ -30159,8 +30171,28 @@
|
||||
name: 'comstar_tg',
|
||||
value: '',
|
||||
fieldLabel: gettext('Target group'),
|
||||
|
|
@ -98,7 +98,7 @@
|
|||
}
|
||||
];
|
||||
|
||||
@@ -30089,7 +30121,7 @@
|
||||
@@ -30191,7 +30223,7 @@
|
||||
xtype: me.isCreate ? 'textfield' : 'displayfield',
|
||||
name: 'comstar_hg',
|
||||
value: '',
|
||||
|
|
@ -107,7 +107,7 @@
|
|||
fieldLabel: gettext('Host group'),
|
||||
allowBlank: true
|
||||
},
|
||||
@@ -30097,9 +30129,60 @@
|
||||
@@ -30199,9 +30231,60 @@
|
||||
xtype: me.isCreate ? 'textfield' : 'displayfield',
|
||||
name: 'lio_tpg',
|
||||
value: '',
|
||||
|
|
|
|||
Loading…
Reference in New Issue