Skip to content

Commit

Permalink
Merge pull request #242 from bogdant36/CTX-6271
Browse files Browse the repository at this point in the history 
CTX-6271: Implemented deactivate node functionality so there is no mo…
  • Loading branch information
@dule1322
dule1322 authored Aug 7, 2024
2 parents 67b61d2 + 7648d69 commit b270b90
Show file tree
Hide file tree
Showing 2 changed files with 66 additions and 18 deletions.
20 changes: 11 additions & 9 deletions coretex/cli/commands/node.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@
@click.option("--image", type = str, help = "Docker image url")
@onBeforeCommandExecute(node_module.initializeNodeConfiguration)
def start(image: Optional[str]) -> None:
config = loadConfig()

if node_module.isRunning():
if not clickPrompt(
"Node is already running. Do you wish to restart the Node? (Y/n)",
Expand All @@ -41,13 +43,11 @@ def start(image: Optional[str]) -> None:
):
return

node_module.stop()
node_module.stop(config.get("nodeId", node_module.fetchNodeId(config["nodeName"])))

if node_module.exists():
node_module.clean()

config = loadConfig()

if image is not None:
config["image"] = image # store forced image (flagged) so we can run autoupdate afterwards
saveConfig(config)
Expand All @@ -65,11 +65,13 @@ def start(image: Optional[str]) -> None:

@click.command()
def stop() -> None:
config = loadConfig()

if not node_module.isRunning():
errorEcho("Node is already offline.")
return

node_module.stop()
node_module.stop(config.get("nodeId", node_module.fetchNodeId(config["nodeName"])))


@click.command()
Expand Down Expand Up @@ -106,7 +108,7 @@ def update(autoAccept: bool, autoDecline: bool) -> None:
):
return

node_module.stop()
node_module.stop(config.get("nodeId", node_module.fetchNodeId(config["nodeName"])))

if not node_module.shouldUpdate(dockerImage):
successEcho("Node is already up to date.")
Expand All @@ -127,7 +129,7 @@ def update(autoAccept: bool, autoDecline: bool) -> None:
):
return

node_module.stop()
node_module.stop(config.get("nodeId", node_module.fetchNodeId(config["nodeName"])))

stdEcho("Updating node...")
node_module.start(dockerImage, config)
Expand All @@ -139,6 +141,8 @@ def update(autoAccept: bool, autoDecline: bool) -> None:
@click.command()
@click.option("--verbose", is_flag = True, help = "Configure node settings manually.")
def config(verbose: bool) -> None:
config = loadConfig()

if node_module.isRunning():
if not clickPrompt(
"Node is already running. Do you wish to stop the Node? (Y/n)",
Expand All @@ -149,9 +153,7 @@ def config(verbose: bool) -> None:
errorEcho("If you wish to reconfigure your node, use coretex node stop commands first.")
return

node_module.stop()

config = loadConfig()
node_module.stop(config.get("nodeId", node_module.fetchNodeId(config["nodeName"])))

if isNodeConfigured(config):
if not clickPrompt(
Expand Down
64 changes: 55 additions & 9 deletions coretex/cli/modules/node.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <https://www.gnu.org/licenses/>.

from typing import Any, Dict, Optional
from typing import Any, Dict, Optional, Tuple, List
from enum import Enum
from pathlib import Path
from base64 import b64encode
Expand Down Expand Up @@ -117,10 +117,53 @@ def clean() -> None:
raise NodeException("Failed to clean inactive Coretex Node.")


def stop() -> None:
def fetchNodeId(name: str) -> int:
config = loadConfig()
params = {
"machine_name": f"={name}"
}

response = networkManager.get("service", params)
if response.hasFailed():
raise NetworkRequestError(response, "Failed to fetch node id.")

responseJson = response.getJson(dict)
data = responseJson.get("data")

if not isinstance(data, list):
raise TypeError(f"Invalid \"data\" type {type(data)}. Expected: \"list\"")

if len(data) == 0:
raise ValueError(f"Node with name \"{name}\" not found.")

nodeJson = data[0]
if not isinstance(nodeJson, dict):
raise TypeError(f"Invalid \"nodeJson\" type {type(nodeJson)}. Expected: \"dict\"")

nodeId = nodeJson.get("id")
if not isinstance(nodeId, int):
raise TypeError(f"Invalid \"nodeId\" type {type(nodeId)}. Expected: \"int\"")

config["nodeId"] = nodeId
saveConfig(config)
return nodeId


def deactivateNode(id: Optional[int]) -> None:
params = {
"id": id
}

response = networkManager.post("service/deactivate", params)
if response.hasFailed():
raise NetworkRequestError(response, "Failed to deactivate node.")


def stop(nodeId: int) -> None:
try:
progressEcho("Stopping Coretex Node...")
docker.stopContainer(config_defaults.DOCKER_CONTAINER_NAME)
deactivateNode(nodeId)
clean()
successEcho("Successfully stopped Coretex Node....")
except BaseException as ex:
Expand Down Expand Up @@ -178,7 +221,7 @@ def registerNode(
publicKey: Optional[bytes] = None,
nearWalletId: Optional[str] = None,
endpointInvocationPrice: Optional[float] = None
) -> str:
) -> Tuple[int, str]:

params: Dict[str, Any] = {
"machine_name": name,
Expand All @@ -200,11 +243,12 @@ def registerNode(
raise NetworkRequestError(response, "Failed to configure node. Please try again...")

accessToken = response.getJson(dict).get("access_token")
nodeId = response.getJson(dict).get("id")

if not isinstance(accessToken, str):
if not isinstance(accessToken, str) or not isinstance(nodeId, int):
raise TypeError("Something went wrong. Please try again...")

return accessToken
return nodeId, accessToken


def selectImageType() -> ImageType:
Expand Down Expand Up @@ -348,7 +392,7 @@ def isConfigurationValid(config: Dict[str, Any]) -> bool:
isValid = False

if config["nodeSwap"] > swapLimit:
errorEcho(f"Configuration not valid. RAM limit in Docker Desktop ({swapLimit}GB) is lower than the configured value ({config['nodeSwap']}GB)")
errorEcho(f"Configuration not valid. SWAP memory limit in Docker Desktop ({swapLimit}GB) is lower than the configured value ({config['nodeSwap']}GB)")
isValid = False

if config["nodeRam"] < config_defaults.MINIMUM_RAM:
Expand Down Expand Up @@ -383,7 +427,7 @@ def configureNode(config: Dict[str, Any], verbose: bool) -> None:

config["storagePath"] = config_defaults.DEFAULT_STORAGE_PATH
config["nodeRam"] = int(min(max(config_defaults.MINIMUM_RAM, ramLimit), config_defaults.DEFAULT_RAM))
config["nodeSwap"] = config_defaults.DEFAULT_SWAP_MEMORY
config["nodeSwap"] = int(min(config_defaults.DEFAULT_SWAP_MEMORY, swapLimit))
config["nodeSharedMemory"] = config_defaults.DEFAULT_SHARED_MEMORY
config["cpuCount"] = int(min(cpuLimit, config_defaults.DEFAULT_CPU_COUNT))
config["nodeMode"] = config_defaults.DEFAULT_NODE_MODE
Expand Down Expand Up @@ -434,7 +478,9 @@ def configureNode(config: Dict[str, Any], verbose: bool) -> None:
else:
stdEcho("To configure node manually run coretex node config with --verbose flag.")

config["nodeAccessToken"] = registerNode(config["nodeName"], nodeMode, publicKey, nearWalletId, endpointInvocationPrice)
nodeId, nodeAccessToken = registerNode(config["nodeName"], nodeMode, publicKey, nearWalletId, endpointInvocationPrice)
config["nodeId"] = nodeId
config["nodeAccessToken"] = nodeAccessToken
config["nodeMode"] = nodeMode


Expand All @@ -458,7 +504,7 @@ def initializeNodeConfiguration() -> None:
errorEcho("If you wish to reconfigure your node, use \"coretex node stop\" command first.")
return

stop()
stop(config["nodeId"])

configureNode(config, verbose = False)
saveConfig(config)

0 comments on commit b270b90

Please sign in to comment.