From 82fe27242f51d2059f5b1300224fe5909106d358 Mon Sep 17 00:00:00 2001 From: Kevin Scott Adams Date: Thu, 13 Dec 2018 07:37:03 -0500 Subject: [PATCH] Update patch set to the latest version of Proxmox-VE: 5.3-1 - Updated patch file for pvemanagerlib.js to pve-manager: 5.3-5 - Updated patch file for apidoc.js to pve-docs: 5.3-1 - Updated patch file for ZFSPlugin.pm to libpve-storage-perl: 5.0-33 --- perl5/PVE/Storage/ZFSPlugin-5.0-33.pm.patch | 140 ++++++++++++++++ perl5/PVE/Storage/ZFSPlugin.pm.patch | 4 +- pve-docs/api-viewer/apidoc-5.3-1.js.patch | 79 +++++++++ pve-docs/api-viewer/apidoc.js.patch | 10 +- pve-manager/js/.gitignore | 1 + pve-manager/js/pvemanagerlib-5.3-5.js.patch | 167 ++++++++++++++++++++ pve-manager/js/pvemanagerlib.js.patch | 22 +-- 7 files changed, 405 insertions(+), 18 deletions(-) create mode 100644 perl5/PVE/Storage/ZFSPlugin-5.0-33.pm.patch create mode 100644 pve-docs/api-viewer/apidoc-5.3-1.js.patch create mode 100644 pve-manager/js/.gitignore create mode 100644 pve-manager/js/pvemanagerlib-5.3-5.js.patch diff --git a/perl5/PVE/Storage/ZFSPlugin-5.0-33.pm.patch b/perl5/PVE/Storage/ZFSPlugin-5.0-33.pm.patch new file mode 100644 index 0000000..b6d78e7 --- /dev/null +++ b/perl5/PVE/Storage/ZFSPlugin-5.0-33.pm.patch @@ -0,0 +1,140 @@ +--- ZFSPlugin-5.0-33.pm 2018-11-27 07:23:15.000000000 -0500 ++++ ZFSPlugin.pm 2018-12-12 07:52:12.010724836 -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; +@@ -32,7 +33,7 @@ + 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 +41,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 +65,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 +165,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 +192,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 +237,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 +273,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); + } + diff --git a/perl5/PVE/Storage/ZFSPlugin.pm.patch b/perl5/PVE/Storage/ZFSPlugin.pm.patch index 0a1c8a4..b6d78e7 100644 --- a/perl5/PVE/Storage/ZFSPlugin.pm.patch +++ b/perl5/PVE/Storage/ZFSPlugin.pm.patch @@ -1,5 +1,5 @@ ---- ZFSPlugin.pm.orig 2018-10-03 11:02:46.000000000 -0400 -+++ ZFSPlugin.pm 2018-10-28 21:27:44.794732848 -0400 +--- ZFSPlugin-5.0-33.pm 2018-11-27 07:23:15.000000000 -0500 ++++ ZFSPlugin.pm 2018-12-12 07:52:12.010724836 -0500 @@ -10,6 +10,7 @@ use base qw(PVE::Storage::ZFSPoolPlugin); diff --git a/pve-docs/api-viewer/apidoc-5.3-1.js.patch b/pve-docs/api-viewer/apidoc-5.3-1.js.patch new file mode 100644 index 0000000..be00eb5 --- /dev/null +++ b/pve-docs/api-viewer/apidoc-5.3-1.js.patch @@ -0,0 +1,79 @@ +--- apidoc-5.3-1.js 2018-11-29 07:15:54.000000000 -0500 ++++ apidoc.js 2018-12-12 07:50:46.935472070 -0500 +@@ -33477,6 +33477,31 @@ + "type" : "string", + "typetext" : "" + }, ++ "freenas_user" : { ++ "description" : "FreeNAS user for API access", ++ "optional" : 1, ++ "type" : "string", ++ "typetext" : "" ++ }, ++ "freenas_password" : { ++ "description" : "FreeNAS password for API access", ++ "optional" : 1, ++ "type" : "string", ++ "typetext" : "" ++ }, ++ "freenas_use_ssl" : { ++ "description" : "FreeNAS API access via SSL", ++ "optional" : 1, ++ "type" : "boolean", ++ "typetext" : "" ++ }, ++ "freenas_apiv4_host" : { ++ "description" : "FreeNAS API Host via IPv4", ++ "format" : "address", ++ "optional" : 1, ++ "type" : "string", ++ "typetext" : "" ++ }, + "fuse" : { + "description" : "Mount CephFS through FUSE.", + "optional" : 1, +@@ -33633,6 +33658,12 @@ + "type" : "boolean", + "typetext" : "" + }, ++ "target" : { ++ "description" : "iSCSI target.", ++ "optional" : 1, ++ "type" : "string", ++ "typetext" : "" ++ }, + "transport" : { + "description" : "Gluster transport: tcp or rdma", + "enum" : [ +@@ -33840,6 +33871,31 @@ + "optional" : 1, + "type" : "string", + "typetext" : "" ++ }, ++ "freenas_user" : { ++ "description" : "FreeNAS user for API access", ++ "optional" : 1, ++ "type" : "string", ++ "typetext" : "" ++ }, ++ "freenas_password" : { ++ "description" : "FreeNAS password for API access", ++ "optional" : 1, ++ "type" : "string", ++ "typetext" : "" ++ }, ++ "freenas_use_ssl" : { ++ "description" : "FreeNAS API access via SSL", ++ "optional" : 1, ++ "type" : "boolean", ++ "typetext" : "" ++ }, ++ "freenas_apiv4_host" : { ++ "description" : "FreeNAS API Host via IPv4", ++ "format" : "address", ++ "optional" : 1, ++ "type" : "string", ++ "typetext" : "" + }, + "fuse" : { + "description" : "Mount CephFS through FUSE.", diff --git a/pve-docs/api-viewer/apidoc.js.patch b/pve-docs/api-viewer/apidoc.js.patch index f726c6b..be00eb5 100644 --- a/pve-docs/api-viewer/apidoc.js.patch +++ b/pve-docs/api-viewer/apidoc.js.patch @@ -1,6 +1,6 @@ ---- apidoc-5.2-9.js 2018-11-10 14:28:44.022355849 -0500 -+++ apidoc.js 2018-11-10 15:49:38.873720011 -0500 -@@ -32448,6 +32448,31 @@ +--- apidoc-5.3-1.js 2018-11-29 07:15:54.000000000 -0500 ++++ apidoc.js 2018-12-12 07:50:46.935472070 -0500 +@@ -33477,6 +33477,31 @@ "type" : "string", "typetext" : "" }, @@ -32,7 +32,7 @@ "fuse" : { "description" : "Mount CephFS through FUSE.", "optional" : 1, -@@ -32604,6 +32629,12 @@ +@@ -33633,6 +33658,12 @@ "type" : "boolean", "typetext" : "" }, @@ -45,7 +45,7 @@ "transport" : { "description" : "Gluster transport: tcp or rdma", "enum" : [ -@@ -32810,6 +32841,31 @@ +@@ -33840,6 +33871,31 @@ "optional" : 1, "type" : "string", "typetext" : "" diff --git a/pve-manager/js/.gitignore b/pve-manager/js/.gitignore new file mode 100644 index 0000000..7ad0727 --- /dev/null +++ b/pve-manager/js/.gitignore @@ -0,0 +1 @@ +/pvemanagerlib.js diff --git a/pve-manager/js/pvemanagerlib-5.3-5.js.patch b/pve-manager/js/pvemanagerlib-5.3-5.js.patch new file mode 100644 index 0000000..b2eadf0 --- /dev/null +++ b/pve-manager/js/pvemanagerlib-5.3-5.js.patch @@ -0,0 +1,167 @@ +--- pvemanagerlib-5.3-5.js 2018-12-03 06:13:25.000000000 -0500 ++++ pvemanagerlib.js 2018-12-12 07:51:20.483169368 -0500 +@@ -5854,6 +5854,7 @@ + alias: ['widget.pveiScsiProviderSelector'], + comboItems: [ + ['comstar', 'Comstar'], ++ ['freenas', 'FreeNAS-API'], + [ 'istgt', 'istgt'], + [ 'iet', 'IET'], + [ 'LIO', 'LIO'] +@@ -29983,6 +29984,7 @@ + data: { + isLIO: false, + isComstar: true, ++ isFreeNAS: false, + hasWriteCacheOption: true + } + }, +@@ -29995,10 +29997,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(''); ++ } + } + }, + +@@ -30016,6 +30027,7 @@ + }, + + setValues: function diff(values) { ++ values.freenas_confirmpw = values.freenas_password; + values.writecache = values.nowritecache ? 0 : 1; + this.callParent([values]); + }, +@@ -30032,7 +30044,7 @@ + allowBlank: false + }, + { +- xtype: me.isCreate ? 'textfield' : 'displayfield', ++ xtype: 'textfield', + name: 'pool', + value: '', + fieldLabel: gettext('Pool'), +@@ -30046,7 +30058,7 @@ + allowBlank: false + }, + { +- xtype: me.isCreate ? 'textfield' : 'displayfield', ++ xtype: 'textfield', + name: 'target', + value: '', + fieldLabel: gettext('Target'), +@@ -30057,8 +30069,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}' }, + } + ]; + +@@ -30089,7 +30121,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 + }, +@@ -30097,9 +30129,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; ++ } + } + ]; + diff --git a/pve-manager/js/pvemanagerlib.js.patch b/pve-manager/js/pvemanagerlib.js.patch index ce35642..b2eadf0 100644 --- a/pve-manager/js/pvemanagerlib.js.patch +++ b/pve-manager/js/pvemanagerlib.js.patch @@ -1,6 +1,6 @@ ---- pvemanagerlib-5.2-10.js 2018-10-23 07:18:18.058603386 -0400 -+++ pvemanagerlib.js 2018-10-23 15:29:52.573563883 -0400 -@@ -5597,6 +5597,7 @@ +--- pvemanagerlib-5.3-5.js 2018-12-03 06:13:25.000000000 -0500 ++++ pvemanagerlib.js 2018-12-12 07:51:20.483169368 -0500 +@@ -5854,6 +5854,7 @@ alias: ['widget.pveiScsiProviderSelector'], comboItems: [ ['comstar', 'Comstar'], @@ -8,7 +8,7 @@ [ 'istgt', 'istgt'], [ 'iet', 'IET'], [ 'LIO', 'LIO'] -@@ -28583,6 +28584,7 @@ +@@ -29983,6 +29984,7 @@ data: { isLIO: false, isComstar: true, @@ -16,7 +16,7 @@ hasWriteCacheOption: true } }, -@@ -28595,10 +28597,19 @@ +@@ -29995,10 +29997,19 @@ } }, changeISCSIProvider: function(f, newVal, oldVal) { @@ -37,7 +37,7 @@ } }, -@@ -28616,6 +28627,7 @@ +@@ -30016,6 +30027,7 @@ }, setValues: function diff(values) { @@ -45,7 +45,7 @@ values.writecache = values.nowritecache ? 0 : 1; this.callParent([values]); }, -@@ -28632,7 +28644,7 @@ +@@ -30032,7 +30044,7 @@ allowBlank: false }, { @@ -54,7 +54,7 @@ name: 'pool', value: '', fieldLabel: gettext('Pool'), -@@ -28646,7 +28658,7 @@ +@@ -30046,7 +30058,7 @@ allowBlank: false }, { @@ -63,7 +63,7 @@ name: 'target', value: '', fieldLabel: gettext('Target'), -@@ -28657,8 +28669,28 @@ +@@ -30057,8 +30069,28 @@ name: 'comstar_tg', value: '', fieldLabel: gettext('Target group'), @@ -93,7 +93,7 @@ } ]; -@@ -28689,7 +28721,7 @@ +@@ -30089,7 +30121,7 @@ xtype: me.isCreate ? 'textfield' : 'displayfield', name: 'comstar_hg', value: '', @@ -102,7 +102,7 @@ fieldLabel: gettext('Host group'), allowBlank: true }, -@@ -28697,9 +28729,60 @@ +@@ -30097,9 +30129,60 @@ xtype: me.isCreate ? 'textfield' : 'displayfield', name: 'lio_tpg', value: '',