Hi Canh,
Ack
Thanks
Lennart
> -----Original Message-----
> From: Canh Van Truong <canh.v.tru...@dektech.com.au>
> Sent: den 24 augusti 2018 10:57
> To: Lennart Lund <lennart.l...@ericsson.com>; Vu Minh Nguyen
> <vu.m.ngu...@dektech.com.au>
> Cc: opensaf-devel@lists.sourceforge.net; Canh Van Truong
> <canh.v.tru...@dektech.com.au>
> Subject: [PATCH 1/1] log: fix timeout when deleting configuration stream
> [#2903]
>
> During closing stream, log sevice does try again in 8s when renaming file.
> the log server is hung in that time and cannot poll and process any requests.
> If the completed_callback come from imm in that time, the callback cannot
> be
> processed in time (in 6s) and cause timeout issue happen.
>
> The try again in 8s should be remove to avoid hanging any requests. And
> specialy
> here is to avoid timeout of callback requests from imm
> ---
> src/log/logd/lgs_stream.cc | 15 ---------------
> 1 file changed, 15 deletions(-)
>
> diff --git a/src/log/logd/lgs_stream.cc b/src/log/logd/lgs_stream.cc
> index 4f50f5a98..28344c8cd 100644
> --- a/src/log/logd/lgs_stream.cc
> +++ b/src/log/logd/lgs_stream.cc
> @@ -833,9 +833,6 @@ void log_stream_close(log_stream_t **s, time_t
> *close_time_ptr) {
> std::string file_to_rename;
> char *timeString = NULL;
> std::string emptyStr = "";
> - uint32_t msecs_waited = 0;
> - const unsigned int max_waiting_time = 8 * 1000; /* 8 secs */
> - const unsigned int sleep_delay_ms = 500;
> SaUint32T trace_num_openers;
> struct timespec closetime_tspec;
> const std::string root_path =
> @@ -887,12 +884,6 @@ void log_stream_close(log_stream_t **s, time_t
> *close_time_ptr) {
> /* Rename stream log file */
> rc = lgs_file_rename_h(root_path, stream->pathName, file_to_rename,
> timeString, LGS_LOG_FILE_EXT, &emptyStr);
> - while ((rc == -1) && (msecs_waited < max_waiting_time)) {
> - usleep(sleep_delay_ms * 1000);
> - msecs_waited += sleep_delay_ms;
> - rc = lgs_file_rename_h(root_path, stream->pathName,
> file_to_rename,
> - timeString, LGS_LOG_FILE_EXT, &emptyStr);
> - }
>
> if (rc == -1) {
> LOG_WA("Could not rename log file: %s", strerror(errno));
> @@ -902,12 +893,6 @@ void log_stream_close(log_stream_t **s, time_t
> *close_time_ptr) {
> /* Rename stream config file */
> rc = lgs_file_rename_h(root_path, stream->pathName, stream-
> >fileName,
> timeString, LGS_LOG_FILE_CONFIG_EXT, &emptyStr);
> - while ((rc == -1) && (msecs_waited < max_waiting_time)) {
> - usleep(sleep_delay_ms * 1000);
> - msecs_waited += sleep_delay_ms;
> - rc = lgs_file_rename_h(root_path, stream->pathName, stream-
> >fileName,
> - timeString, LGS_LOG_FILE_CONFIG_EXT,
> &emptyStr);
> - }
> if (rc == -1) {
> LOG_WA("Could not rename config file: %s", strerror(errno));
> goto done_files;
> --
> 2.15.1
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Opensaf-devel mailing list
Opensaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
