Updated patches for the latest Proxmox VE updates and added donation

button. - Update README.md to include a requested donation button for the project. Thank you. - Updated patch for pvemanagerlib.js for Proxmox VE pve-manager: 6.0-5 - Updated patch for apidoc.js for Proxmox VE pve-docs: 6.0-4 - Updated patch for ZFSPlugin.pm for Proxmox VE libpve-storage-perl: 6.0-6
2019-08-07 22:57:22 -04:00 · 2019-08-07 22:57:22 -04:00 · 4b46f2240f
parent 5091f0ae12
commit 4b46f2240f
7 changed files with 435 additions and 19 deletions
--- a/README.md
+++ b/README.md
@ -1,4 +1,5 @@
-# FreeNAS ZFS over iSCSI interface
+# FreeNAS ZFS over iSCSI interface  [![Donate](https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=TCLNEMBUYQUXN&source=url)
+

 Please be aware that this plugin uses the FreeNAS APIs and NOT the ssh/scp interface like the other plugins use, but...

--- a/perl5/PVE/Storage/ZFSPlugin-6.0-6_1.pm.patch
+++ b/perl5/PVE/Storage/ZFSPlugin-6.0-6_1.pm.patch
@ -0,0 +1,147 @@
+--- ZFSPlugin.pm.orig	2019-07-25 07:34:52.000000000 -0400
+++ ZFSPlugin.pm	2019-08-07 13:28:29.268383007 -0400
+@@ -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);
+ }
+ 
--- a/perl5/PVE/Storage/ZFSPlugin.pm.patch
+++ b/perl5/PVE/Storage/ZFSPlugin.pm.patch
@ -1,5 +1,5 @@
--- ZFSPlugin.pm.orig	2019-06-25 06:54:50.000000000 -0400
-+++ ZFSPlugin.pm	2019-07-16 13:36:48.817831174 -0400
+--- ZFSPlugin.pm.orig	2019-07-25 07:34:52.000000000 -0400
+++ ZFSPlugin.pm	2019-08-07 13:28:29.268383007 -0400
@@ -10,6 +10,7 @@
 
 use base qw(PVE::Storage::ZFSPoolPlugin);
--- a/pve-docs/api-viewer/apidoc-6.0-4_1.js.patch
+++ b/pve-docs/api-viewer/apidoc-6.0-4_1.js.patch
@ -0,0 +1,79 @@
+--- apidoc.js.orig	2019-07-15 15:45:00.000000000 -0400
+++ apidoc.js	2019-08-07 13:28:29.292382229 -0400
+@@ -35001,6 +35001,31 @@
+                            "type" : "string",
+                            "typetext" : "<string>"
+                         },
+                        "freenas_user" : {
+                           "description" : "FreeNAS user for API access",
+                           "optional" : 1,
+                           "type" : "string",
+                           "typetext" : "<string>"
+                        },
+                        "freenas_password" : {
+                           "description" : "FreeNAS password for API access",
+                           "optional" : 1,
+                           "type" : "string",
+                           "typetext" : "<string>"
+                        },
+                        "freenas_use_ssl" : {
+                           "description" : "FreeNAS API access via SSL",
+                           "optional" : 1,
+                           "type" : "boolean",
+                           "typetext" : "<boolean>"
+                        },
+                        "freenas_apiv4_host" : {
+                           "description" : "FreeNAS API Host via IPv4",
+                           "format" : "address",
+                           "optional" : 1,
+                           "type" : "string",
+                           "typetext" : "<string>"
+                        },
+                         "fuse" : {
+                            "description" : "Mount CephFS through FUSE.",
+                            "optional" : 1,
+@@ -35157,6 +35182,12 @@
+                            "type" : "boolean",
+                            "typetext" : "<boolean>"
+                         },
+                        "target" : {
+                           "description" : "iSCSI target.",
+                           "optional" : 1,
+                           "type" : "string",
+                           "typetext" : "<string>"
+                        },
+                         "transport" : {
+                            "description" : "Gluster transport: tcp or rdma",
+                            "enum" : [
+@@ -35362,6 +35393,31 @@
+                      "optional" : 1,
+                      "type" : "string",
+                      "typetext" : "<string>"
+                  },
+                  "freenas_user" : {
+                     "description" : "FreeNAS user for API access",
+                     "optional" : 1,
+                     "type" : "string",
+                     "typetext" : "<string>"
+                  },
+                  "freenas_password" : {
+                     "description" : "FreeNAS password for API access",
+                     "optional" : 1,
+                     "type" : "string",
+                     "typetext" : "<string>"
+                  },
+                  "freenas_use_ssl" : {
+                     "description" : "FreeNAS API access via SSL",
+                     "optional" : 1,
+                     "type" : "boolean",
+                     "typetext" : "<boolean>"
+                  },
+                  "freenas_apiv4_host" : {
+                     "description" : "FreeNAS API Host via IPv4",
+                     "format" : "address",
+                     "optional" : 1,
+                     "type" : "string",
+                     "typetext" : "<string>"
+                   },
+                   "fuse" : {
+                      "description" : "Mount CephFS through FUSE.",
--- a/pve-docs/api-viewer/apidoc.js.patch
+++ b/pve-docs/api-viewer/apidoc.js.patch
@ -1,6 +1,6 @@
--- apidoc.js.orig	2019-04-08 02:02:09.000000000 -0400
-+++ apidoc.js	2019-05-11 10:34:28.305764709 -0400
-@@ -34385,6 +34385,31 @@
+--- apidoc.js.orig	2019-07-15 15:45:00.000000000 -0400
+++ apidoc.js	2019-08-07 13:28:29.292382229 -0400
+@@ -35001,6 +35001,31 @@
                            "type" : "string",
                            "typetext" : "<string>"
                         },
@ -32,7 +32,7 @@
                         "fuse" : {
                            "description" : "Mount CephFS through FUSE.",
                            "optional" : 1,
-@@ -34541,6 +34566,12 @@
+@@ -35157,6 +35182,12 @@
                            "type" : "boolean",
                            "typetext" : "<boolean>"
                         },
@ -45,7 +45,7 @@
                         "transport" : {
                            "description" : "Gluster transport: tcp or rdma",
                            "enum" : [
-@@ -34748,6 +34779,31 @@
+@@ -35362,6 +35393,31 @@
                      "optional" : 1,
                      "type" : "string",
                      "typetext" : "<string>"
--- a/pve-manager/js/pvemanagerlib-6.0-5_1.js.patch
+++ b/pve-manager/js/pvemanagerlib-6.0-5_1.js.patch
@ -0,0 +1,189 @@
+--- pvemanagerlib.js.orig	2019-07-23 13:21:08.000000000 -0400
+++ pvemanagerlib.js	2019-08-07 13:28:29.304381840 -0400
+@@ -6182,6 +6182,7 @@
+     alias: ['widget.pveiScsiProviderSelector'],
+     comboItems: [
+ 	['comstar', 'Comstar'],
+	['freenas', 'FreeNAS-API'],
+ 	[ 'istgt', 'istgt'],
+ 	[ 'iet', 'IET'],
+ 	[ 'LIO', 'LIO']
+@@ -32977,6 +32978,7 @@
+ 	data: {
+ 	    isLIO: false,
+ 	    isComstar: true,
+	    isFreeNAS: false,
+ 	    hasWriteCacheOption: true
+ 	}
+     },
+@@ -32989,10 +32991,26 @@
+ 	    }
+ 	},
+ 	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_user_field').allowBlank = true;
+		me.lookupReference('freenas_password_field').setValue('');
+		me.lookupReference('freenas_password_field').allowBlank = true;
+		me.lookupReference('freenas_confirmpw_field').setValue('');
+		me.lookupReference('freenas_confirmpw_field').allowBlank = true;
+	    } else {
+		me.lookupReference('freenas_user_field').allowBlank = false;
+		me.lookupReference('freenas_password_field').allowBlank = false;
+		me.lookupReference('freenas_confirmpw_field').allowBlank = false;
+	    }
+ 	}
+     },
+ 
+@@ -33010,6 +33028,7 @@
+     },
+ 
+     setValues: function diff(values) {
+	values.freenas_confirmpw = values.freenas_password;
+ 	values.writecache = values.nowritecache ? 0 : 1;
+ 	this.callParent([values]);
+     },
+@@ -33026,7 +33045,7 @@
+ 		allowBlank: false
+ 	    },
+ 	    {
+-		xtype: me.isCreate ? 'textfield' : 'displayfield',
+		xtype: 'textfield',
+ 		name: 'pool',
+ 		value: '',
+ 		fieldLabel: gettext('Pool'),
+@@ -33036,11 +33055,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'),
+@@ -33051,8 +33070,33 @@
+ 		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: '',
+		fieldLabel: gettext('API Username'),
+		bind: {
+		    hidden: '{!isFreeNAS}'
+		}
+ 	    }
+ 	];
+ 
+@@ -33083,7 +33127,9 @@
+ 		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
+ 	    },
+@@ -33091,9 +33137,62 @@
+ 		xtype: me.isCreate ? 'textfield' : 'displayfield',
+ 		name: 'lio_tpg',
+ 		value: '',
+-		bind: me.isCreate ? { disabled: '{!isLIO}' } : { hidden: '{!isLIO}' },
+-		allowBlank: false,
+-		fieldLabel: gettext('Target portal group')
+		bind: {
+		    hidden: '{!isLIO}'
+		},
+		fieldLabel: gettext('Target portal group'),
+		allowBlank: true
+	    },
+	    {
+		xtype: 'proxmoxtextfield',
+		name: 'freenas_apiv4_host',
+		reference: 'freenas_apiv4_host_field',
+		value: '',
+		editable: true,
+		emptyText: Proxmox.Utils.noneText,
+		bind: {
+		    hidden: '{!isFreeNAS}'
+		},
+		fieldLabel: gettext('API IPv4 Host'),
+	    },
+	    {
+		xtype: 'proxmoxtextfield',
+		name: 'freenas_password',
+		reference: 'freenas_password_field',
+		inputType: me.isCreate ? '' : 'password',
+		value: '',
+		editable: true,
+		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,
+		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;
+		}
+ 	    }
+ 	];
+ 
--- a/pve-manager/js/pvemanagerlib.js.patch
+++ b/pve-manager/js/pvemanagerlib.js.patch
@ -1,6 +1,6 @@
--- pvemanagerlib.js.orig	2019-07-26 04:14:56.000000000 -0400
-+++ pvemanagerlib.js	2019-08-05 16:02:38.484913553 -0400
-@@ -6094,6 +6094,7 @@
+--- pvemanagerlib.js.orig	2019-07-23 13:21:08.000000000 -0400
+++ pvemanagerlib.js	2019-08-07 13:28:29.304381840 -0400
+@@ -6182,6 +6182,7 @@
     alias: ['widget.pveiScsiProviderSelector'],
     comboItems: [
 	['comstar', 'Comstar'],
@ -8,7 +8,7 @@
 	[ 'istgt', 'istgt'],
 	[ 'iet', 'IET'],
 	[ 'LIO', 'LIO']
-@@ -31722,6 +31723,7 @@
+@@ -32977,6 +32978,7 @@
 	data: {
 	    isLIO: false,
 	    isComstar: true,
@ -16,7 +16,7 @@
 	    hasWriteCacheOption: true
 	}
     },
-@@ -31734,10 +31736,26 @@
+@@ -32989,10 +32991,26 @@
 	    }
 	},
 	changeISCSIProvider: function(f, newVal, oldVal) {
@ -44,7 +44,7 @@
 	}
     },
 
-@@ -31755,6 +31773,7 @@
+@@ -33010,6 +33028,7 @@
     },
 
     setValues: function diff(values) {
@ -52,7 +52,7 @@
 	values.writecache = values.nowritecache ? 0 : 1;
 	this.callParent([values]);
     },
-@@ -31771,7 +31790,7 @@
+@@ -33026,7 +33045,7 @@
 		allowBlank: false
 	    },
 	    {
@ -61,7 +61,7 @@
 		name: 'pool',
 		value: '',
 		fieldLabel: gettext('Pool'),
-@@ -31781,11 +31800,11 @@
+@@ -33036,11 +33055,11 @@
 		xtype: me.isCreate ? 'textfield' : 'displayfield',
 		name: 'blocksize',
 		value: '4k',
@ -75,7 +75,7 @@
 		name: 'target',
 		value: '',
 		fieldLabel: gettext('Target'),
-@@ -31796,8 +31815,33 @@
+@@ -33051,8 +33070,33 @@
 		name: 'comstar_tg',
 		value: '',
 		fieldLabel: gettext('Target group'),
@ -110,7 +110,7 @@
 	    }
 	];
 
-@@ -31828,7 +31872,9 @@
+@@ -33083,7 +33127,9 @@
 		xtype: me.isCreate ? 'textfield' : 'displayfield',
 		name: 'comstar_hg',
 		value: '',
@ -121,7 +121,7 @@
 		fieldLabel: gettext('Host group'),
 		allowBlank: true
 	    },
-@@ -31836,9 +31882,62 @@
+@@ -33091,9 +33137,62 @@
 		xtype: me.isCreate ? 'textfield' : 'displayfield',
 		name: 'lio_tpg',
 		value: '',