Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

NAS-133018 / 25.04 / Fix up test to match reality of NFS client reporting. #15244

Merged
merged 1 commit into from
Dec 19, 2024
Merged

NAS-133018 / 25.04 / Fix up test to match reality of NFS client reporting. #15244

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions tests/api2/test_usage_reporting.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import pytest
import time
from itertools import chain
from middlewared.test.integration.assets.nfs import nfs_server
from middlewared.test.integration.assets.ftp import ftp_server
Expand Down Expand Up @@ -52,20 +53,26 @@ def test_gather_types(get_usage_sample):


def test_nfs_reporting(get_usage_sample):
""" Confirm we are correctly reporting the number of connections """
# Initial state should have NFSv[3,4] and no connections
""" Confirm we are correctly reporting the number of NFS connections """
# NOTE: NFSv3 can be wildly inaccurate. Connections are recorded by mount requests.
# Connections get cleared by umount requests. Stale entries can easily accumulate.
# NFSv4 clients can be slow-ish to showup.
# Initial state should have NFSv[3,4] and possibly some stale NFSv3 connections from previous tests
assert set(get_usage_sample['NFS']['enabled_protocols']) == set(["NFSV3", "NFSV4"])
assert get_usage_sample['NFS']['num_clients'] == 0

# Establish two connections
nfs_path = f'/mnt/{pool_name}/test_nfs'
with nfs_dataset("test_nfs"):
with nfs_share(nfs_path):
with nfs_server():
# Wait a couple secs for clients to report in
time.sleep(2)
baseline_sample = call('usage.gather')['NFS']['num_clients']

# Establish a new connection.
with SSH_NFS(truenas_server.ip, nfs_path,
user=user, password=password, ip=truenas_server.ip):
usage_sample = call('usage.gather')
assert usage_sample['NFS']['num_clients'] == 1
assert usage_sample['NFS']['num_clients'] == baseline_sample + 1


def test_ftp_reporting(get_usage_sample):
Expand Down
Loading