Merge remote-tracking branch 'origin/master' into NAS-131317

truenas · Oct 11, 2024 · 766d5e3 · 766d5e3
2 parents fbd46de + 897cf08
commit 766d5e3
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 7 deletions.
diff --git a/src/middlewared/middlewared/plugins/docker/update.py b/src/middlewared/middlewared/plugins/docker/update.py
@@ -116,6 +116,10 @@ async def do_update(self, job, data):
                 await self.middleware.call('docker.setup.status_change')
             elif config['pool'] and config['address_pools'] != old_config['address_pools']:
                 job.set_progress(60, 'Starting docker')
+                catalog_sync_job = await self.middleware.call('docker.fs_manage.mount')
+                if catalog_sync_job:
+                    await catalog_sync_job.wait()
+
                 await self.middleware.call('service.start', 'docker')
 
             if not old_config['nvidia'] and config['nvidia']:

diff --git a/src/middlewared/middlewared/plugins/enclosure_/slot_mappings.py b/src/middlewared/middlewared/plugins/enclosure_/slot_mappings.py
@@ -190,7 +190,7 @@ def get_nvme_slot_info(model):
                                 DISK_TOP_KEY: False,
                                 DISK_REAR_KEY: True,
                                 DISK_INTERNAL_KEY: False
-                            } for i, j in zip(range(1, 4), range(25, 28))
+                            } for i, j in zip(range(1, 4), range(49, 52))
                         },
                         'r50b_nvme_enclosure': {
                             i: {
@@ -201,7 +201,7 @@ def get_nvme_slot_info(model):
                                 DISK_TOP_KEY: False,
                                 DISK_REAR_KEY: True,
                                 DISK_INTERNAL_KEY: False
-                            } for i, j in zip(range(1, 3), range(25, 27))
+                            } for i, j in zip(range(1, 3), range(49, 51))
                         },
                         'r50bm_nvme_enclosure': {
                             i: {
@@ -212,7 +212,7 @@ def get_nvme_slot_info(model):
                                 DISK_TOP_KEY: False,
                                 DISK_REAR_KEY: True,
                                 DISK_INTERNAL_KEY: False
-                            } for i, j in zip(range(1, 5), range(25, 29))
+                            } for i, j in zip(range(1, 5), range(49, 53))
                         },
                     }
                 }

diff --git a/src/middlewared/middlewared/plugins/smb_/util_smbconf.py b/src/middlewared/middlewared/plugins/smb_/util_smbconf.py
@@ -110,8 +110,8 @@ def generate_smb_conf_dict(
         'netbios aliases': ' '.join(smb_service_config['netbiosalias']),
         'guest account': smb_service_config['guest'] if smb_service_config['guest'] else 'nobody',
         'obey pam restrictions': any(home_share),
-        'create mask': smb_service_config['filemask'] or '0744',
-        'directory mask': smb_service_config['dirmask'] or '0755',
+        'create mask': smb_service_config['filemask'] or '0664',
+        'directory mask': smb_service_config['dirmask'] or '0775',
         'ntlm auth': smb_service_config['ntlmv1_auth'],
         'server multichannel support': smb_service_config['multichannel'],
         'unix charset': smb_service_config['unixcharset'],

diff --git a/src/middlewared/middlewared/pytest/unit/plugins/test_smb.py b/src/middlewared/middlewared/pytest/unit/plugins/test_smb.py
@@ -232,6 +232,8 @@ def test__base_smb():
     assert conf['idmap config * : backend'] == 'tdb'
     assert conf['idmap config * : range'] == '90000001 - 100000000'
     assert conf['server smb encrypt'] == 'default'
+    assert conf['directory mask'] == '0775'
+    assert conf['create mask'] == '0664'
 
 
 def test__syslog():

diff --git a/tests/api2/test_300_nfs.py b/tests/api2/test_300_nfs.py
@@ -568,7 +568,6 @@ def test_service_update(self, start_nfs, nfsd, cores, expected):
                     # We know apriori that the current state is managed_nfsd == True
                     with nfs_config():
                         # Test making change to non-'server' setting does not change managed_nfsd
-                        call("nfs.update", {"bindip": [truenas_server.ip]})
                         assert call("nfs.config")['managed_nfsd'] == expected['managed']
                 else:
                     with pytest.raises(ValidationErrors) as ve:
@@ -1256,6 +1255,8 @@ def test_service_ports(self, start_nfs, test_port):
         This also tests the port range and exclude.
         """
         assert start_nfs is True
+        # Multiple restarts cause systemd failures.  Reset the systemd counters.
+        reset_svcs("nfs-idmapd nfs-mountd nfs-server rpcbind rpc-statd")
 
         # Friendly index names
         name = 0

diff --git a/tests/api2/test_docker_setup.py b/tests/api2/test_docker_setup.py
@@ -58,6 +58,16 @@ def test_apps_are_running():
     assert call('docker.status')['status'] == 'RUNNING'
 
 
+@pytest.mark.dependency(depends=['docker_setup'])
+def test_apps_dataset_after_address_pool_update():
+    docker_config = call('docker.update', {'address_pools': [{'base': '172.17.0.0/12', 'size': 27}]}, job=True)
+    assert docker_config['address_pools'] == [{'base': '172.17.0.0/12', 'size': 27}]
+    assert call('filesystem.statfs', IX_APPS_MOUNT_PATH)['source'] == docker_config['dataset']
+    assert call('docker.status')['status'] == 'RUNNING'
+
+
 def test_unset_docker_pool(docker_pool):
-    docker_config = call('docker.update', {'pool': None}, job=True)
+    docker_config = call(
+        'docker.update', {'pool': None, 'address_pools': [{'base': '172.17.0.0/12', 'size': 24}]}, job=True
+    )
     assert docker_config['pool'] is None, docker_config