-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add patch for gridcf/gct#117 "Restore log transfer functionality that…
… was accidentally removed" (SOFTWARE-4041) git-svn-id: https://vdt.cs.wisc.edu/svn/native/redhat/trunk@25620 4e558342-562e-0410-864c-e07659590f8c
- Loading branch information
1 parent
f746829
commit bc49a11
Showing
2 changed files
with
100 additions
and
1 deletion.
There are no files selected for viewing
94 changes: 94 additions & 0 deletions
94
globus-gridftp-server/osg/GCT-117-Restore-log-transfer-functionality-that-was-.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,94 @@ | ||
| From 7e331c37b0936b704884448244184e51bb5c949b Mon Sep 17 00:00:00 2001 | ||
| From: Mattias Ellert <mattias.ellert@physics.uu.se> | ||
| Date: Thu, 9 Jan 2020 14:55:24 +0100 | ||
| Subject: [PATCH] GCT #117: Restore log transfer functionality that was | ||
| accidentally removed | ||
|
|
||
| --- | ||
| globus_i_gfs_data.c | 70 +++++++++++++++++++++++++++++++++++++++++++++ | ||
| 1 file changed, 70 insertions(+) | ||
|
|
||
| diff --git a/globus_i_gfs_data.c b/globus_i_gfs_data.c | ||
| index bc7a086..2d6b50f 100644 | ||
| --- a/globus_i_gfs_data.c | ||
| +++ b/globus_i_gfs_data.c | ||
| @@ -10435,6 +10435,76 @@ globus_l_gfs_data_end_transfer_kickout( | ||
| } | ||
| } | ||
|
|
||
| + /* log transfer */ | ||
| + if(op->node_ndx == 0 && | ||
| + op->cached_res == GLOBUS_SUCCESS && | ||
| + globus_i_gfs_config_string("log_transfer")) | ||
| + { | ||
| + char * type; | ||
| + globus_gfs_transfer_info_t * info; | ||
| + struct timeval end_timeval; | ||
| + | ||
| + info = (globus_gfs_transfer_info_t *) op->info_struct; | ||
| + | ||
| + if(op->writing) | ||
| + { | ||
| + if(info->list_type) | ||
| + { | ||
| + if(strncmp(info->list_type, "LIST:", 5) == 0) | ||
| + { | ||
| + type = "LIST"; | ||
| + } | ||
| + else if(strncmp(info->list_type, "NLST:", 5) == 0) | ||
| + { | ||
| + type = "NLST"; | ||
| + } | ||
| + else | ||
| + { | ||
| + type = "MLSD"; | ||
| + } | ||
| + } | ||
| + else if(info->module_name || info->partial_offset != 0 || | ||
| + info->partial_length != -1) | ||
| + { | ||
| + type = "ERET"; | ||
| + } | ||
| + else | ||
| + { | ||
| + type = "RETR"; | ||
| + } | ||
| + } | ||
| + else | ||
| + { | ||
| + if(info->module_name || info->partial_offset != 0 || | ||
| + !info->truncate) | ||
| + { | ||
| + type = "ESTO"; | ||
| + } | ||
| + else | ||
| + { | ||
| + type = "STOR"; | ||
| + } | ||
| + } | ||
| + gettimeofday(&end_timeval, NULL); | ||
| + | ||
| + globus_i_gfs_log_transfer( | ||
| + op->node_count, | ||
| + op->data_handle->info.nstreams, | ||
| + &op->start_timeval, | ||
| + &end_timeval, | ||
| + op->remote_ip ? op->remote_ip : "0.0.0.0", | ||
| + op->data_handle->info.blocksize, | ||
| + op->data_handle->info.tcp_bufsize, | ||
| + info->pathname, | ||
| + op->bytes_transferred, | ||
| + 226, | ||
| + "/", | ||
| + type, | ||
| + op->session_handle->username, | ||
| + retransmit_str, | ||
| + op->session_handle->taskid); | ||
| + } | ||
| + | ||
| if(retransmit_str) | ||
| { | ||
| globus_free(retransmit_str); | ||
| -- | ||
| 2.25.1 | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters