Make server connection info file-local #86
Conversation
mattjala
force-pushed
the
conn_info_local
branch
2 times, most recently
from
1409474 to
c132dc0
Compare
mattjala
force-pushed
the
conn_info_local
branch
2 times, most recently
from
ac098d2 to
9872181
Compare
|
|
mattjala
force-pushed
the
conn_info_local
branch
from
9872181 to
f281b38
Compare
src/rest_vol_link.c
Outdated
| @@ -120,6 +121,12 @@ RV_link_create(H5VL_link_create_args_t *args, void *obj, const H5VL_loc_params_t | |||
| new_link_loc_obj = (RV_object_t *)hard_link_target_obj; | |||
| } /* end if */ | |||
|
|
|||
| if (new_link_loc_obj && ((base_URL = new_link_loc_obj->domain->u.file.server_info.base_URL) == NULL)) | |||
There was a problem hiding this comment.
These conditions need to be split so that assigning of base_URL doesn't depend on new_link_loc_obj being non-NULL
src/rest_vol_link.c
Outdated
| if (new_link_loc_obj && ((base_URL = new_link_loc_obj->domain->u.file.server_info.base_URL) == NULL)) | ||
| FUNC_GOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "location object does not have valid server URL"); | ||
|
|
||
| if (!base_URL) |
There was a problem hiding this comment.
Duplicate check here since NULL is already checked above when base_URL is assigned
| @@ -843,6 +861,33 @@ RV_object_specific(void *obj, const H5VL_loc_params_t *loc_params, H5VL_object_s | |||
| strncpy(iter_object->u.file.filepath_name, loc_obj->u.file.filepath_name, | |||
| strlen(loc_obj->u.file.filepath_name) + 1); | |||
|
|
|||
| if ((iter_object->u.file.server_info.username = | |||
There was a problem hiding this comment.
Won't iter_object here already be inheriting the file/domain from loc_obj? If so, it seems like we'd be overwriting and leaking memory by allocating the file's server_info fields here
There was a problem hiding this comment.
iter_object has the server_info struct's pointers copied into it, pointing at the allocated memory of the original file object. If we didn't allocate more memory here, the server information of the original would be freed when this copy is closed.
H5Fdelete doesn't receive file information besides the name, so this may be a non-starter.
mattjala
force-pushed
the
conn_info_local
branch
from
8ffade1 to
8e0d25a
Compare
H5Fdeletedoesn't receive any information about the file to delete besides its filename, so this may be impossible to completely refactor.The global info (username/password in the global curl handle, global
base_URLvariable) haven't been removed yet, but each request to server now uses a file-local username and password.