Skip to content

Allow orderers to be removed when the organization network is None #716

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

Merged
yeasy merged 3 commits into from
Jul 16, 2025
+51 −56
Merged

Allow orderers to be removed when the organization network is None #716

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
07efdef
Allow orderers to be removed when the organization network is None
dodo920306 Jul 14, 2025
db081c1
Fix continuation line over-indented for visual indent
dodo920306 Jul 14, 2025
0efc046
Merge branch 'main' into fix/invalid-orderers-cannot-be-deleted
yeasy Jul 16, 2025
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
107 changes: 51 additions & 56 deletions src/api-engine/api/routes/node/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -466,8 +466,6 @@ def _agent_params(self, pk):
if org is None:
raise ResourceNotFound("Organization Not Found")
network = org.network
if network is None:
raise ResourceNotFound("Network Not Found")
agent = org.agent.get()
if agent is None:
raise ResourceNotFound("Agent Not Found")
Expand All @@ -486,7 +484,7 @@ def _agent_params(self, pk):
info["type"] = node.type
info["name"] = "{}.{}".format(node.name, org_name)
info["urls"] = agent.urls
info["network_type"] = network.type
info["network_type"] = None if network is None else network.type
info["agent_type"] = agent.type
info["container_name"] = "{}.{}".format(node.name, org_name)
info["ports"] = ports
Expand Down Expand Up @@ -574,62 +572,59 @@ def destroy(self, request, pk=None):
:rtype: rest_framework.status
"""
try:
try:
node = Node.objects.get(id=pk)
infos = self._agent_params(pk)
agent = AgentHandler(infos)
agent_exist = agent.get()
node.status = "removing"
node.save()
if node.type == "orderer":
orderer_cnt = Node.objects.filter(
type="orderer", organization__network=node.organization.network).count()
if orderer_cnt == 1:
raise ResourceInUse("Orderer In Use")
res = False
# if agent not exist or no continer is created for node, do not try to stop/delete container
if not agent_exist or not node.cid:
res = True
else:
# try to stop/delete container 3 times
# TODO: optimize the retry logic
for i in range(3):
LOG.info(
"Retry to stop/delete container %d time(s).", i + 1)
try:
response = agent.stop()
if response is not True:
LOG.error(
"Failed when agent stops/deletes container: %s", response)
continue
response = agent.delete()
if response is not True:
LOG.error(
"Failed when agent stops/deletes container: %s", response)
continue
res = True
except Exception as e:
node = Node.objects.get(id=pk)
infos = self._agent_params(pk)
agent = AgentHandler(infos)
agent_exist = agent.get()
node.status = "removing"
node.save()
if node.type == "orderer" and node.organization.network is not None:
orderer_cnt = Node.objects.filter(
type="orderer", organization__network=node.organization.network).count()
if orderer_cnt == 1:
raise ResourceInUse("Orderer In Use")
res = False
# if agent not exist or no continer is created for node, do not try to stop/delete container
if not agent_exist or not node.cid:
res = True
else:
# try to stop/delete container 3 times
# TODO: optimize the retry logic
for i in range(3):
LOG.info(
"Retry to stop/delete container %d time(s).", i + 1)
try:
response = agent.stop()
if response is not True:
LOG.error(
"Exception when agent stops/deletes container: %s", e)
"Failed when agent stops/deletes container: %s", response)
continue
break
if res:
fabric_path = "{}/{}".format(FABRIC_NODE,
infos["container_name"])
if os.path.exists(fabric_path):
shutil.rmtree(fabric_path, True)
prod_path = "{}/{}".format(PRODUCTION_NODE,
infos["container_name"])
if os.path.exists(prod_path):
shutil.rmtree(prod_path, True)
node.delete()
# node.status = "exited"
# node.save()
else:
return Response(ok({"delete": False}), status=status.HTTP_202_ACCEPTED)
except ObjectDoesNotExist:
raise ResourceNotFound("Node Not Found")
response = agent.delete()
if response is not True:
LOG.error(
"Failed when agent stops/deletes container: %s", response)
continue
res = True
except Exception as e:
LOG.error(
"Exception when agent stops/deletes container: %s", e)
continue
break
if res:
fabric_path = "{}/{}".format(FABRIC_NODE, infos["container_name"])
if os.path.exists(fabric_path):
shutil.rmtree(fabric_path, True)
prod_path = "{}/{}".format(PRODUCTION_NODE, infos["container_name"])
if os.path.exists(prod_path):
shutil.rmtree(prod_path, True)
node.delete()
# node.status = "exited"
# node.save()
else:
return Response(ok({"delete": False}), status=status.HTTP_202_ACCEPTED)
return Response(ok({"delete": True}), status=status.HTTP_202_ACCEPTED)
except ObjectDoesNotExist:
raise ResourceNotFound("Node Not Found")
except (ResourceNotFound, ResourceInUse) as e:
raise e
except Exception as e:
Expand Down
Loading