Skip to content

Commit

Permalink
Merge pull request ceph#765 from gbregman/devel
Browse files Browse the repository at this point in the history 
Clean up references to enable_ha as it's now always true
  • Loading branch information
@gbregman
gbregman authored Jul 28, 2024
2 parents 9dbd6ad + 29df953 commit 488cc44
Show file tree
Hide file tree
Showing 2 changed files with 45 additions and 70 deletions.
110 changes: 45 additions & 65 deletions control/grpc.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,10 +139,8 @@ def __init__(self, config: GatewayConfig, gateway_state: GatewayStateHandler, rp
self.bdev_cluster = {}
self.bdev_params = {}
self.subsystem_nsid_bdev = defaultdict(dict)
self.subsystem_nsid_anagrp = defaultdict(dict)
self.subsystem_listeners = defaultdict(set)
self._init_cluster_context()
self.subsys_ha = {}
self.subsys_max_ns = {}

def is_valid_host_nqn(nqn):
Expand Down Expand Up @@ -559,7 +557,6 @@ def create_subsystem_safe(self, request, context):
errmsg = f"{create_subsystem_error_prefix}: {errmsg}"
self.logger.error(f"{errmsg}")
return pb2.req_status(status=errno.EEXIST, error_message=errmsg)
enable_ha = (request.enable_ha == True)
ret = rpc_nvmf.nvmf_create_subsystem(
self.spdk_rpc_client,
nqn=request.subsystem_nqn,
Expand All @@ -568,9 +565,8 @@ def create_subsystem_safe(self, request, context):
max_namespaces=request.max_namespaces,
min_cntlid=min_cntlid,
max_cntlid=max_cntlid,
ana_reporting = enable_ha,
ana_reporting = True,
)
self.subsys_ha[request.subsystem_nqn] = enable_ha
self.subsys_max_ns[request.subsystem_nqn] = request.max_namespaces if request.max_namespaces else 32
self.logger.debug(f"create_subsystem {request.subsystem_nqn}: {ret}")
except Exception as ex:
Expand Down Expand Up @@ -664,7 +660,6 @@ def delete_subsystem_safe(self, request, context):
self.spdk_rpc_client,
nqn=request.subsystem_nqn,
)
self.subsys_ha.pop(request.subsystem_nqn)
self.subsys_max_ns.pop(request.subsystem_nqn)
if request.subsystem_nqn in self.subsystem_listeners:
self.subsystem_listeners.pop(request.subsystem_nqn)
Expand Down Expand Up @@ -783,7 +778,6 @@ def create_namespace(self, subsystem_nqn, bdev_name, nsid, anagrpid, uuid, conte
uuid=uuid,
)
self.subsystem_nsid_bdev[subsystem_nqn][nsid] = bdev_name
self.subsystem_nsid_anagrp[subsystem_nqn][nsid] = anagrpid
self.logger.debug(f"subsystem_add_ns: {nsid}")
except Exception as ex:
self.logger.exception(add_namespace_error_prefix)
Expand Down Expand Up @@ -836,8 +830,8 @@ def set_ana_state_safe(self, ana_info: pb2.ana_info, context=None):
for gs in nas.states:
self.ana_map[nqn][gs.grp_id] = gs.state

# could mean also that the subsystem is not created yet
if not self.get_subsystem_ha_status(nqn):
# If this is not set the subsystem was not created yet
if not nqn in self.subsys_max_ns:
continue

self.logger.debug(f"Iterate over {nqn=} {self.subsystem_listeners[nqn]=}")
Expand Down Expand Up @@ -1064,7 +1058,6 @@ def namespace_change_load_balancing_group_safe(self, request, context):
nsid=request.nsid,
anagrpid=request.anagrpid
)
self.subsystem_nsid_anagrp[request.subsystem_nqn][request.nsid] = request.anagrpid
self.logger.debug(f"nvmf_subsystem_set_ns_anagrpid: {ret}")
except Exception as ex:
errmsg = f"{change_lb_group_failure_prefix}:\n{ex}"
Expand Down Expand Up @@ -2010,15 +2003,6 @@ def list_connections_safe(self, request, context):
def list_connections(self, request, context=None):
return self.execute_grpc_function(self.list_connections_safe, request, context)

def get_subsystem_ha_status(self, nqn) -> bool:
if nqn not in self.subsys_ha:
self.logger.warning(f"Subsystem {nqn} not found")
return False

enable_ha = self.subsys_ha[nqn]
self.logger.debug(f"Subsystem {nqn} enable_ha: {enable_ha}")
return enable_ha

def create_listener_safe(self, request, context):
"""Creates a listener for a subsystem at a given IP/Port."""

Expand Down Expand Up @@ -2088,51 +2072,48 @@ def create_listener_safe(self, request, context):
self.logger.error(create_listener_error_prefix)
return pb2.req_status(status=errno.EINVAL, error_message=create_listener_error_prefix)

enable_ha = self.get_subsystem_ha_status(request.nqn)

if enable_ha:
try:
self.logger.debug(f"create_listener nvmf_subsystem_listener_set_ana_state {request=} set inaccessible for all ana groups")
_ana_state = "inaccessible"
ret = rpc_nvmf.nvmf_subsystem_listener_set_ana_state(
self.spdk_rpc_client,
nqn=request.nqn,
ana_state=_ana_state,
trtype="TCP",
traddr=request.traddr,
trsvcid=str(request.trsvcid),
adrfam=adrfam)
self.logger.debug(f"create_listener nvmf_subsystem_listener_set_ana_state response {ret=}")

# have been provided with ana state for this nqn prior to creation
# update optimized ana groups
if self.ana_map[request.nqn]:
for x in range (self.subsys_max_ns[request.nqn]):
ana_grp = x+1
if ana_grp in self.ana_map[request.nqn] and self.ana_map[request.nqn][ana_grp] == pb2.ana_state.OPTIMIZED:
_ana_state = "optimized"
self.logger.debug(f"using ana_map: set listener on nqn : {request.nqn} ana state : {_ana_state} for group : {ana_grp}")
ret = rpc_nvmf.nvmf_subsystem_listener_set_ana_state(
self.spdk_rpc_client,
nqn=request.nqn,
ana_state=_ana_state,
trtype="TCP",
traddr=request.traddr,
trsvcid=str(request.trsvcid),
adrfam=adrfam,
anagrpid=ana_grp )
self.logger.debug(f"create_listener nvmf_subsystem_listener_set_ana_state response {ret=}")
try:
self.logger.debug(f"create_listener nvmf_subsystem_listener_set_ana_state {request=} set inaccessible for all ana groups")
_ana_state = "inaccessible"
ret = rpc_nvmf.nvmf_subsystem_listener_set_ana_state(
self.spdk_rpc_client,
nqn=request.nqn,
ana_state=_ana_state,
trtype="TCP",
traddr=request.traddr,
trsvcid=str(request.trsvcid),
adrfam=adrfam)
self.logger.debug(f"create_listener nvmf_subsystem_listener_set_ana_state response {ret=}")

# have been provided with ana state for this nqn prior to creation
# update optimized ana groups
if self.ana_map[request.nqn]:
for x in range (self.subsys_max_ns[request.nqn]):
ana_grp = x+1
if ana_grp in self.ana_map[request.nqn] and self.ana_map[request.nqn][ana_grp] == pb2.ana_state.OPTIMIZED:
_ana_state = "optimized"
self.logger.debug(f"using ana_map: set listener on nqn : {request.nqn} ana state : {_ana_state} for group : {ana_grp}")
ret = rpc_nvmf.nvmf_subsystem_listener_set_ana_state(
self.spdk_rpc_client,
nqn=request.nqn,
ana_state=_ana_state,
trtype="TCP",
traddr=request.traddr,
trsvcid=str(request.trsvcid),
adrfam=adrfam,
anagrpid=ana_grp )
self.logger.debug(f"create_listener nvmf_subsystem_listener_set_ana_state response {ret=}")

except Exception as ex:
errmsg=f"{create_listener_error_prefix}: Error setting ANA state"
self.logger.exception(errmsg)
errmsg=f"{errmsg}:\n{ex}"
resp = self.parse_json_exeption(ex)
status = errno.EINVAL
if resp:
status = resp["code"]
errmsg = f"{create_listener_error_prefix}: Error setting ANA state: {resp['message']}"
return pb2.req_status(status=status, error_message=errmsg)
except Exception as ex:
errmsg=f"{create_listener_error_prefix}: Error setting ANA state"
self.logger.exception(errmsg)
errmsg=f"{errmsg}:\n{ex}"
resp = self.parse_json_exeption(ex)
status = errno.EINVAL
if resp:
status = resp["code"]
errmsg = f"{create_listener_error_prefix}: Error setting ANA state: {resp['message']}"
return pb2.req_status(status=status, error_message=errmsg)

if context:
# Update gateway state
Expand Down Expand Up @@ -2370,7 +2351,7 @@ def list_subsystems_safe(self, request, context):
continue
if s["subtype"] == "NVMe":
s["namespace_count"] = len(s["namespaces"])
s["enable_ha"] = self.get_subsystem_ha_status(s["nqn"])
s["enable_ha"] = True
else:
s["namespace_count"] = 0
s["enable_ha"] = False
Expand Down Expand Up @@ -2405,7 +2386,6 @@ def get_subsystems_safe(self, request, context):
for n in s[ns_key]:
nqn = s["nqn"]
nsid = n["nsid"]
n["anagrpid"] = self.subsystem_nsid_anagrp[nqn][nsid]
bdev = self.subsystem_nsid_bdev[nqn][nsid]
nonce = self.cluster_nonce[self.bdev_cluster[bdev]]
n["nonce"] = nonce
Expand Down
5 changes: 0 additions & 5 deletions tests/test_cli.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -638,7 +638,6 @@ def test_add_host_invalid_nqn(self, caplog):
def test_create_listener(self, caplog, listener, gateway):
caplog.clear()
cli(["listener", "add", "--subsystem", subsystem, "--host-name", host_name] + listener)
assert "enable_ha: True" in caplog.text
assert "ipv4" in caplog.text.lower()
assert f"Adding {subsystem} listener at {listener[1]}:{listener[3]}: Successful" in caplog.text

Expand All @@ -647,15 +646,13 @@ def test_create_listener(self, caplog, listener, gateway):
def test_create_listener_ipv6(self, caplog, listener_ipv6, gateway):
caplog.clear()
cli(["--server-address", server_addr_ipv6, "listener", "add", "--subsystem", subsystem, "--host-name", host_name] + listener_ipv6)
assert "enable_ha: True" in caplog.text
assert "ipv6" in caplog.text.lower()
assert f"Adding {subsystem} listener at [{listener_ipv6[1]}]:{listener_ipv6[3]}: Successful" in caplog.text

@pytest.mark.parametrize("listener", listener_list_no_port)
def test_create_listener_no_port(self, caplog, listener, gateway):
caplog.clear()
cli(["listener", "add", "--subsystem", subsystem, "--host-name", host_name] + listener)
assert "enable_ha: True" in caplog.text
assert "ipv4" in caplog.text.lower()
assert f"Adding {subsystem} listener at {listener[1]}:4420: Successful" in caplog.text

Expand Down Expand Up @@ -782,7 +779,6 @@ def test_delete_listener_no_port(self, caplog, listener, gateway):
def test_delete_listener_using_wild_hostname(self, caplog, listener, gateway):
caplog.clear()
cli(["listener", "add", "--subsystem", subsystem, "--host-name", host_name] + listener)
assert "enable_ha: True" in caplog.text
assert "ipv4" in caplog.text.lower()
assert f"Adding {subsystem} listener at {listener[1]}:{listener[3]}: Successful" in caplog.text
cli(["--format", "json", "listener", "list", "--subsystem", subsystem])
Expand Down Expand Up @@ -890,7 +886,6 @@ def test_add_namespace_ana(self, caplog, gateway):
def test_create_listener_ana(self, caplog, listener, gateway):
caplog.clear()
cli(["listener", "add", "--subsystem", subsystem, "--host-name", host_name] + listener)
assert "enable_ha: True" in caplog.text
assert "ipv4" in caplog.text.lower()
assert f"Adding {subsystem} listener at {listener[1]}:{listener[3]}: Successful" in caplog.text

Expand Down

0 comments on commit 488cc44

Please sign in to comment.