refactor(acl): improve execution speed

This commit is contained in:
Silejonu 2025-06-05 08:54:42 +02:00
parent 392fd0deaa
commit 9ec1d668b4

View file

@ -243,23 +243,17 @@ def acl_changed(module, cmd, entry, use_nfsv4_acls=False):
cmd.insert(1, '--test') cmd.insert(1, '--test')
lines = run_acl(module, cmd) lines = run_acl(module, cmd)
counter = 0 counter = 0
lines_checked = 0
lines_unchanged = 0
for line in lines: for line in lines:
lines_checked += 1 if not use_nfsv4_acls and not line.endswith('*,*'):
if line.endswith('*,*') and not use_nfsv4_acls: return True
lines_unchanged += 1
# if use_nfsv4_acls and entry is listed # if use_nfsv4_acls and entry is listed
if use_nfsv4_acls and entry == line: if use_nfsv4_acls and entry == line:
counter += 1 counter += 1
if lines_unchanged == lines_checked:
return False
# The current 'nfs4_setfacl --test' lists a new entry, # The current 'nfs4_setfacl --test' lists a new entry,
# which will be added at the top of list, followed by the existing entries. # which will be added at the top of the list, followed by the existing entries.
# So if the entry has already been registered, the entry should be find twice. # So if the entry has already been registered, the entry should be found twice.
if counter == 2: if not use_nfsv4_acls or counter == 2:
return False return False
return True return True