Skip to content

Commit

Permalink
remove library version
Browse files Browse the repository at this point in the history
  • Loading branch information
tphung3 committed Nov 21, 2024
1 parent 41fc363 commit 19035dc
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 19 deletions.
7 changes: 2 additions & 5 deletions taskvine/src/manager/vine_manager.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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)
Expand Down
2 changes: 0 additions & 2 deletions taskvine/src/manager/vine_protocol.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
7 changes: 0 additions & 7 deletions taskvine/src/manager/vine_schedule.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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);

Expand Down
3 changes: 0 additions & 3 deletions taskvine/src/manager/vine_worker_info.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
3 changes: 1 addition & 2 deletions taskvine/src/worker/vine_worker.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit 19035dc

Please sign in to comment.