Fixed block size issue and updated for Proxmox VE 5.3-5

- Removed code in FreeNAS.PM that used the blocksize field from the GUI
for the use of iSCSI block size causing migration and large extent
sizes. Fixes issues #9 and #33.
- Prefixed 'ZFS' to the 'Block Size' label on the GUI.
- Updated for 5.3-5
This commit is contained in:
KevinAdams 2018-12-21 15:22:04 -05:00 committed by Kevin Scott Adams
parent 5e5f649fe1
commit 5e255a6208
5 changed files with 23 additions and 23 deletions

View File

@ -148,16 +148,8 @@ sub run_create_lu {
my $target_id = freenas_get_targetid($scfg);
die "Unable to find the target id for $scfg->{target}" if !defined($target_id);
my $bs=$scfg->{blocksize};
if (index($bs, "k") >= 0) {
chop($bs); $bs = $bs * 1024;
syslog("info","FreeNAS::create_lu(lun_path=$lun_path, lun_id=$lun_id) : blocksize convert $scfg->{blocksize} = $bs");
} else {
syslog("info","FreeNAS::create_lu(lun_path=$lun_path, lun_id=$lun_id) : blocksize $bs");
}
# Create the extent
my $extent = freenas_iscsi_create_extent($scfg, $lun_path, $bs);
my $extent = freenas_iscsi_create_extent($scfg, $lun_path);
# Associate the new extent to the target
my $link = freenas_iscsi_create_target_to_extent($scfg, $target_id, $extent->{'id'}, $lun_id);
@ -315,10 +307,9 @@ sub freenas_iscsi_get_extent {
# Parameters:
# - target config (scfg)
# - lun_path
# - lun_bs
#
sub freenas_iscsi_create_extent {
my ($scfg, $lun_path, $lun_bs) = @_;
my ($scfg, $lun_path) = @_;
my $name = $lun_path;
$name =~ s/^.*\///; # all from last /
@ -330,7 +321,6 @@ sub freenas_iscsi_create_extent {
my $request = {
"iscsi_target_extent_type" => "Disk",
"iscsi_target_extent_name" => $name,
"iscsi_target_extent_blocksize" => $lun_bs,
"iscsi_target_extent_disk" => $device,
};
@ -338,7 +328,7 @@ sub freenas_iscsi_create_extent {
my $code = $client->responseCode();
if ($code == 201) {
my $result = decode_json($client->responseContent());
syslog("info", "FreeNAS::API::create_extent(lun_path=" . $result->{'iscsi_target_extent_path'} . ", lun_bs=$lun_bs) : sucessfull");
syslog("info", "FreeNAS::API::create_extent(lun_path=" . $result->{'iscsi_target_extent_path'} . ") : sucessfull");
return $result;
} else {
freenas_api_log_error($client, "create_extent");

View File

@ -1,5 +1,5 @@
--- apidoc-5.3-1.js 2018-11-29 07:15:54.000000000 -0500
+++ apidoc.js 2018-12-12 07:50:46.935472070 -0500
--- apidoc-5.3-1.js 2018-12-21 12:46:55.459865478 -0500
+++ apidoc.js 2018-12-06 15:50:21.487987807 -0500
@@ -33477,6 +33477,31 @@
"type" : "string",
"typetext" : "<string>"

View File

@ -1,5 +1,5 @@
--- apidoc-5.3-1.js 2018-11-29 07:15:54.000000000 -0500
+++ apidoc.js 2018-12-12 07:50:46.935472070 -0500
--- apidoc-5.3-1.js 2018-12-21 12:46:55.459865478 -0500
+++ apidoc.js 2018-12-06 15:50:21.487987807 -0500
@@ -33477,6 +33477,31 @@
"type" : "string",
"typetext" : "<string>"

View File

@ -1,5 +1,5 @@
--- pvemanagerlib-5.3-5.js 2018-12-03 06:13:25.000000000 -0500
+++ pvemanagerlib.js 2018-12-12 07:51:20.483169368 -0500
--- 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 @@
alias: ['widget.pveiScsiProviderSelector'],
comboItems: [
@ -54,7 +54,12 @@
name: 'pool',
value: '',
fieldLabel: gettext('Pool'),
@@ -30046,7 +30058,7 @@
@@ -30042,11 +30054,11 @@
xtype: me.isCreate ? 'textfield' : 'displayfield',
name: 'blocksize',
value: '4k',
- fieldLabel: gettext('Block Size'),
+ fieldLabel: gettext('ZFS Block Size'),
allowBlank: false
},
{

View File

@ -1,5 +1,5 @@
--- pvemanagerlib-5.3-5.js 2018-12-03 06:13:25.000000000 -0500
+++ pvemanagerlib.js 2018-12-12 07:51:20.483169368 -0500
--- 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 @@
alias: ['widget.pveiScsiProviderSelector'],
comboItems: [
@ -54,7 +54,12 @@
name: 'pool',
value: '',
fieldLabel: gettext('Pool'),
@@ -30046,7 +30058,7 @@
@@ -30042,11 +30054,11 @@
xtype: me.isCreate ? 'textfield' : 'displayfield',
name: 'blocksize',
value: '4k',
- fieldLabel: gettext('Block Size'),
+ fieldLabel: gettext('ZFS Block Size'),
allowBlank: false
},
{