Misc fixup

(cherry picked from commit 391c8ce)

src/middlewared/middlewared/plugins/iscsi_/extents.py

@@ -109,7 +109,7 @@ async def do_create(self, data):
         await self.clean(data, 'iscsi_extent_create', verrors)
         verrors.check()
 
-        await self.save(data, 'iscsi_extent_create', verrors)
+        await self.middleware.call('iscsi.extent.save', data, 'iscsi_extent_create', verrors)
 
         # This change is being made in conjunction with threads_num being specified in scst.conf
         if data['type'] == 'DISK' and data['path'].startswith('zvol/'):
@@ -161,14 +161,15 @@ async def do_update(self, audit_callback, id_, data):
         verrors.check()
         new.pop(self.locked_field)
 
-        if data['path'] is not None and data['path'].startswith('zvol/'):
-            zvolname = zvol_path_to_name(os.path.join('/dev', data['path']))
+        zvolpath = new.get('path')
+        if zvolpath is not None and zvolpath.startswith('zvol/'):
+            zvolname = zvol_path_to_name(os.path.join('/dev', zvolpath))
             await self.middleware.call(
                 'zfs.dataset.update',
                 zvolname,
                 {
                     'properties': {
-                        'readonly': {'value': 'on' if data['ro'] else 'off'}
+                        'readonly': {'value': 'on' if new['ro'] else 'off'}
                     }
                 }
             )
@@ -183,6 +184,9 @@ async def do_update(self, audit_callback, id_, data):
 
         await self._service_change('iscsitarget', 'reload')
 
+        # scstadmin can have issues when modifying an existing extent, re-run
+        await self._service_change('iscsitarget', 'reload')
+
         return await self.get_instance(id_)
 
     @accepts(
@@ -238,8 +242,8 @@ async def do_delete(self, audit_callback, id_, remove, force):
                 await self.middleware.call('iscsi.alua.wait_for_alua_settled')
 
     @private
-    def validate(self, data):
-        data['serial'] = self.extent_serial(data['serial'])
+    async def validate(self, data):
+        data['serial'] = await self.extent_serial(data['serial'])
         data['naa'] = self.extent_naa(data.get('naa'))
 
     @private
@@ -405,10 +409,10 @@ def clean_size(self, data, schema_name, verrors):
         return data
 
     @private
-    def extent_serial(self, serial):
+    async def extent_serial(self, serial):
         if serial in [None, '']:
             used_serials = [i['serial'] for i in (
-                self.middleware.call_sync('iscsi.extent.query', [], {'select': ['serial']})
+                await self.middleware.call('iscsi.extent.query', [], {'select': ['serial']})
             )]
             tries = 5
             for i in range(tries):

src/middlewared/middlewared/plugins/pool_/dataset.py

@@ -950,7 +950,7 @@ async def do_update(self, audit_callback, id_, data):
                 # as R/O (or R/W), we need to be sure and update the associated extent so
                 # that we don't get into a scenario where the iscsi extent is R/W but the
                 # underlying zvol is R/O. Windows clients seem to not handle this very well.
-                await self.middleware.call('iscsi.global.resync_readonly_property_for_zvol', id_)
+                await self.middleware.call('iscsi.global.resync_readonly_property_for_zvol', id_, data['readonly'])
 
         updated_ds = await self.get_instance(id_)
         self.middleware.send_event('pool.dataset.query', 'CHANGED', id=id_, fields=updated_ds)