Skip to content

Commit

Permalink
small PR changes
Browse files Browse the repository at this point in the history
  • Loading branch information
dblitt committed Dec 12, 2024
1 parent 1e31610 commit 542b00a
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions batch_job/src/batch_queue_flux.c
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ static struct itable *flux_job_info_table = NULL;
// itable mapping batch_queue_jobid_t to flux_job_info
static struct itable *batch_queue_jobid_info_table = NULL;

static int count = 1;
static int job_count = 1;

struct flux_job_info {
batch_queue_id_t job_id;
Expand All @@ -55,6 +55,7 @@ static void delete_flux_job_info(struct flux_job_info *job_info)
static batch_queue_id_t batch_queue_flux_submit(struct batch_queue *q, struct batch_job *bt)
{
// Set same defaults as batch_queue_condor and condor_submit_workers
// Flux does not support setting memory and disk requirements
int64_t cores = 1;
int64_t gpus = 0;

Expand Down Expand Up @@ -111,7 +112,7 @@ static batch_queue_id_t batch_queue_flux_submit(struct batch_queue *q, struct ba
// Flux does not support staging files out of the worker environment, so warn for each file
if (bt->output_files) {
struct batch_file *bf;
LIST_ITERATE(bt->input_files, bf)
LIST_ITERATE(bt->output_files, bf)
{
debug(D_BATCH, "warn: flux does not support output files (%s)", bf->outer_name);
}
Expand All @@ -129,7 +130,7 @@ static batch_queue_id_t batch_queue_flux_submit(struct batch_queue *q, struct ba
uint64_t flux_job_id;
while (fgets(buffer, sizeof(buffer), submit_pipe)) {
if (sscanf(buffer, "%" PRIu64, &flux_job_id) == 1) {
batch_queue_id_t job_id = count++;
batch_queue_id_t job_id = job_count++;
struct batch_job_info *info = calloc(1, sizeof(*info));
info->submitted = time(0);
info->started = time(0);
Expand Down

0 comments on commit 542b00a

Please sign in to comment.