Skip to content

Commit c949b0b

Browse files
authored
vine: write temp files with no-peer-xfers to stating dir (#4227)
1 parent 87104b7 commit c949b0b

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

taskvine/src/manager/vine_file.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -248,14 +248,14 @@ struct vine_file *vine_file_temp()
248248
return vine_file_create("temp", 0, 0, 0, VINE_TEMP, 0, cache, 0);
249249
}
250250

251-
struct vine_file *vine_file_temp_no_peers()
251+
struct vine_file *vine_file_temp_no_peers(const char *staging_dir)
252252
{
253253
// temp files are always cached at workers until explicitely removed.
254254
vine_cache_level_t cache = VINE_CACHE_LEVEL_WORKFLOW;
255255
cctools_uuid_t uuid;
256256
cctools_uuid_create(&uuid);
257257

258-
char *name = string_format("temp-local-%s", uuid.str);
258+
char *name = string_format("%s/temp-local-%s", staging_dir, uuid.str);
259259
return vine_file_create(name, 0, 0, 0, VINE_FILE, 0, cache, VINE_UNLINK_WHEN_DONE);
260260
free(name);
261261
}

taskvine/src/manager/vine_file.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ char * vine_file_make_file_url( const char * source);
6464
struct vine_file *vine_file_local( const char *source, vine_cache_level_t cache, vine_file_flags_t flags );
6565
struct vine_file *vine_file_url( const char *source, vine_cache_level_t cache, vine_file_flags_t flags );
6666
struct vine_file *vine_file_temp();
67-
struct vine_file *vine_file_temp_no_peers();
67+
struct vine_file *vine_file_temp_no_peers( const char *staging_dir );
6868
struct vine_file *vine_file_buffer( const char *buffer, size_t size, vine_cache_level_t cache, vine_file_flags_t flags );
6969
struct vine_file *vine_file_mini_task( struct vine_task *t, const char *name, vine_cache_level_t cache, vine_file_flags_t flags );
7070
struct vine_file *vine_file_untar( struct vine_file *f, vine_cache_level_t cache, vine_file_flags_t flags );

taskvine/src/manager/vine_manager.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6565,7 +6565,7 @@ struct vine_file *vine_declare_temp(struct vine_manager *m)
65656565
struct vine_file *f = vine_file_temp();
65666566
return vine_manager_declare_file(m, f);
65676567
} else {
6568-
struct vine_file *f = vine_file_temp_no_peers();
6568+
struct vine_file *f = vine_file_temp_no_peers(vine_get_path_staging(m, NULL));
65696569
return vine_manager_declare_file(m, f);
65706570
}
65716571
}

0 commit comments

Comments
 (0)