diff --git a/taskvine/src/manager/vine_manager.c b/taskvine/src/manager/vine_manager.c index 190e6c9639..946d1132f7 100644 --- a/taskvine/src/manager/vine_manager.c +++ b/taskvine/src/manager/vine_manager.c @@ -1461,10 +1461,9 @@ static vine_msg_code_t handle_taskvine(struct vine_manager *q, struct vine_worke { char items[4][VINE_LINE_MAX]; int worker_protocol; - int worker_library_protocol; - int n = sscanf(line, "taskvine %d %d %s %s %s %s", &worker_protocol, &worker_library_protocol, items[0], items[1], items[2], items[3]); - if (n != 6) + int n = sscanf(line, "taskvine %d %s %s %s %s", &worker_protocol, items[0], items[1], items[2], items[3]); + if (n != 5) return VINE_MSG_FAILURE; if (worker_protocol != VINE_PROTOCOL_VERSION) { @@ -1473,8 +1472,6 @@ static vine_msg_code_t handle_taskvine(struct vine_manager *q, struct vine_worke return VINE_MSG_FAILURE; } - w->library_protocol_version = worker_library_protocol; - if (w->hostname) free(w->hostname); if (w->os) diff --git a/taskvine/src/manager/vine_protocol.h b/taskvine/src/manager/vine_protocol.h index d32c495d1f..0fe03196cf 100644 --- a/taskvine/src/manager/vine_protocol.h +++ b/taskvine/src/manager/vine_protocol.h @@ -15,8 +15,6 @@ worker, and catalog, but should not be visible to the public user API. #define VINE_PROTOCOL_VERSION 12 -#define VINE_LIBRARY_PROTOCOL_VERSION 1 - #define VINE_LINE_MAX 4096 /**< Maximum length of a vine message line. */ #endif diff --git a/taskvine/src/manager/vine_schedule.c b/taskvine/src/manager/vine_schedule.c index c860f27798..1127e1e636 100644 --- a/taskvine/src/manager/vine_schedule.c +++ b/taskvine/src/manager/vine_schedule.c @@ -10,7 +10,6 @@ See the file COPYING for details. #include "vine_file.h" #include "vine_file_replica.h" #include "vine_mount.h" -#include "vine_protocol.h" #include "debug.h" #include "hash_table.h" @@ -204,12 +203,6 @@ int check_worker_against_task(struct vine_manager *q, struct vine_worker_info *w return 0; } - /* Check if the library and the worker have the same library protocol version. */ - if (t->provides_library && (w->library_protocol_version != VINE_LIBRARY_PROTOCOL_VERSION)) { - debug(D_VINE, "Worker %s can't run library with id %d due to mismatched library protocol version.", w->workerid, t->task_id); - return 0; - } - /* Compute the resources to allocate to this task. */ struct rmsummary *l = vine_manager_choose_resources_for_task(q, w, t); diff --git a/taskvine/src/manager/vine_worker_info.h b/taskvine/src/manager/vine_worker_info.h index d5c9dc7c7d..c52fa91103 100644 --- a/taskvine/src/manager/vine_worker_info.h +++ b/taskvine/src/manager/vine_worker_info.h @@ -28,9 +28,6 @@ struct vine_worker_info { /* Connection to the worker or other client. */ struct link *link; - /* Library protocol version of this worker. */ - int library_protocol_version; - /* Static properties reported by worker when it connects. */ char *hostname; char *os; diff --git a/taskvine/src/worker/vine_worker.c b/taskvine/src/worker/vine_worker.c index 191d55feeb..273b5cd4b6 100644 --- a/taskvine/src/worker/vine_worker.c +++ b/taskvine/src/worker/vine_worker.c @@ -564,9 +564,8 @@ static void report_worker_ready(struct link *manager) } send_async_message(manager, - "taskvine %d %d %s %s %s %d.%d.%d\n", + "taskvine %d %s %s %s %d.%d.%d\n", VINE_PROTOCOL_VERSION, - VINE_LIBRARY_PROTOCOL_VERSION, hostname, options->os_name, options->arch_name,