Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion bibigrid/core/startup.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ def check_cid(cluster_id):
LOG.info("-cid %s is not a cid, but probably the master's ip. "
"Using the master ip instead of cid only works if a cluster key is in your systems default ssh key "
"location (~/.ssh/). Otherwise bibigrid can't identify the cluster key.")
if len(cluster_id) != id_generation.MAX_ID_LENGTH or not set(cluster_id).issubset(
if len(cluster_id) > id_generation.MAX_ID_LENGTH or not set(cluster_id).issubset(
id_generation.CLUSTER_UUID_ALPHABET):
LOG.warning(
f"Cluster id doesn't fit length ({id_generation.MAX_ID_LENGTH}) or defined alphabet "
Expand Down
2 changes: 1 addition & 1 deletion bibigrid/core/startup_rest.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ def setup(cluster_id, configurations_json=None):
"""
if cluster_id:
if cluster_id and (
len(cluster_id) != id_generation.MAX_ID_LENGTH or not set(cluster_id).issubset(
len(cluster_id) > id_generation.MAX_ID_LENGTH or not set(cluster_id).issubset(
id_generation.CLUSTER_UUID_ALPHABET)):
LOG.warning(f"Cluster id doesn't fit length ({id_generation.MAX_ID_LENGTH}) or defined alphabet "
f"({id_generation.CLUSTER_UUID_ALPHABET}). Aborting.")
Expand Down