Merge pull request #324 from shilpa24balaji/3.12_p3b

Update retry time in connection-health-file

CHANGELOG.md

@@ -13,9 +13,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Update to use nanomsg v. 1.1.4
 - requestNewAuthToken will clear the token if it fails.
 - request auth token on every retry, not just after 403
-- update to use nopoll v 1.0.2
-- Add pause/resume heartBeatTimer
-- parodus event handler to listen to interface_down and interface_up event
 
 ## [1.0.2] - 2019-02-08
 - Refactored connection.c and updated corresponding unit tests

CMakeLists.txt

@@ -85,7 +85,7 @@ add_dependencies(libtrower-base64 trower-base64)
 ExternalProject_Add(nopoll
     PREFIX ${PREFIX_DIR}/nopoll
     GIT_REPOSITORY https://github.com/Comcast/nopoll.git
-    GIT_TAG "1.0.2"
+    GIT_TAG "1.0.1"
     CONFIGURE_COMMAND COMMAND <SOURCE_DIR>/autogen.sh --prefix=${PREFIX}
                                                      --includedir=${INCLUDE_DIR}
                                                      --libdir=${LIBRARY_DIR}
@@ -152,7 +152,7 @@ add_dependencies(libcurl curl)
 ExternalProject_Add(cimplog
     PREFIX ${CMAKE_CURRENT_BINARY_DIR}/_prefix/cimplog
     GIT_REPOSITORY https://github.com/Comcast/cimplog.git
-    GIT_TAG "1.0.2"
+    GIT_TAG "1.0.1"
     CMAKE_ARGS += -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} -DBUILD_TESTING=OFF
 )
 add_library(libcimplog STATIC SHARED IMPORTED)

src/ParodusInternal.c

@@ -25,10 +25,6 @@
 #include "config.h"
 #include "connection.h"
 
-bool interface_down_event = false;
-
-pthread_mutex_t interface_down_mut=PTHREAD_MUTEX_INITIALIZER;
-
 /*----------------------------------------------------------------------------*/
 /*                             External Functions                             */
 /*----------------------------------------------------------------------------*/
@@ -143,38 +139,3 @@ void timespec_diff(struct timespec *start, struct timespec *stop,
 
     return;
 }
-
-
-/*------------------------------------------------------------------------------*/
-/*                        For interface_down_event Flag                         */
-/*------------------------------------------------------------------------------*/
-
-// Get value of interface_down_event
-bool get_interface_down_event() 
-{
-	bool tmp = false;
-	pthread_mutex_lock (&interface_down_mut);
-	tmp = interface_down_event;
-	pthread_mutex_unlock (&interface_down_mut);
-	return tmp;
-}
-
-// Reset value of interface_down_event to false
-void reset_interface_down_event() 
-{
-	pthread_mutex_lock (&interface_down_mut);
-	interface_down_event = false;
-	pthread_mutex_unlock (&interface_down_mut);
-}
-
-// set value of interface_down_event to true
-void set_interface_down_event() 
-{
-	pthread_mutex_lock (&interface_down_mut);
-    	interface_down_event = true;
-    	pthread_mutex_unlock (&interface_down_mut);
-}
-
-
-
-

src/ParodusInternal.h

@@ -157,21 +157,6 @@ void addCRUDmsgToQueue(wrp_msg_t *crudMsg);
 void timespec_diff(struct timespec *start, struct timespec *stop,
                    struct timespec *result);
 
-
-/*------------------------------------------------------------------------------*/
-/*                        For interface_down_event Flag                         */
-/*------------------------------------------------------------------------------*/
-
-// Get value of interface_down_event
-bool get_interface_down_event();
-
-// Reset value of interface_down_event to false
-void reset_interface_down_event();
-
-// Set value of interface_down_event to true
-void set_interface_down_event();
-  
-
 #ifdef __cplusplus
 }
 #endif

src/close_retry.c

@@ -26,17 +26,6 @@
 bool close_retry = false;
 
 pthread_mutex_t close_mut=PTHREAD_MUTEX_INITIALIZER;
-pthread_cond_t close_con=PTHREAD_COND_INITIALIZER;
-
-pthread_cond_t *get_global_close_retry_con(void)
-{
-    return &close_con;
-}
-
-pthread_mutex_t *get_global_close_retry_mut(void)
-{
-    return &close_mut;
-}
 
 // Get value of close_retry
 bool get_close_retry() 
@@ -59,9 +48,8 @@ void reset_close_retry()
 // set value of close_retry to true
 void set_close_retry() 
 {
-    pthread_mutex_lock (&close_mut);
+	pthread_mutex_lock (&close_mut);
     close_retry = true;
-    pthread_cond_signal(&close_con);
     pthread_mutex_unlock (&close_mut);
 }
 

src/close_retry.h

@@ -31,12 +31,6 @@
 extern "C" {
 #endif
 
-// Get the condition variable
-pthread_cond_t *get_global_close_retry_con();
-
-// Get the mutex variable
-pthread_mutex_t *get_global_close_retry_mut();
-
 // Get value of close_retry
 bool get_close_retry();
 

src/config.c

@@ -435,7 +435,6 @@ int parseCommandLine(int argc,char **argv,ParodusCfg * cfg)
         case 'r':
           parStrncpy(cfg->hw_last_reboot_reason, optarg,sizeof(cfg->hw_last_reboot_reason));
           ParodusInfo("hw_last_reboot_reason is %s\n",cfg->hw_last_reboot_reason);
-          OnboardLog("Last reboot reason is %s\n",cfg->hw_last_reboot_reason);
           break;
 
         case 'n':

src/conn_interface.c

@@ -101,7 +101,6 @@ void createSocketConnection(void (* initKeypress)())
     if(!create_conn_rtn)
     {
 		ParodusError("Unrecovered error, terminating the process\n");
-		OnboardLog("Unrecovered error, terminating the process\n");
 		abort();
     }
     packMetaData();
@@ -145,7 +144,6 @@ void createSocketConnection(void (* initKeypress)())
             {
                 ParodusError("ping wait time > %d . Terminating the connection with WebPA server and retrying\n", webpa_ping_timeout_ms / 1000);
                 ParodusInfo("Reconnect detected, setting Ping_Miss reason for Reconnect\n");
-                OnboardLog("Reconnect detected, setting Ping_Miss reason for Reconnect\n");
                 set_global_reconnect_reason("Ping_Miss");
                 set_global_reconnect_status(true);
                 set_close_retry();
@@ -187,7 +185,7 @@ void createSocketConnection(void (* initKeypress)())
             createNopollConnection(ctx);
             stop_conn_in_progress ();
         }
-       } while(!g_shutdown);
+       } while(!get_close_retry() && !g_shutdown);
 
     pthread_mutex_lock (get_global_svc_mut());
     pthread_cond_signal (get_global_svc_con());

src/connection.c

@@ -214,6 +214,13 @@ int update_backoff_delay (backoff_timer_t *timer)
 static void backoff_delay (backoff_timer_t *timer)
 {
   update_backoff_delay (timer);
+
+  // Update retry time for conn progress
+  if(timer->count == timer->max_count) 
+  {
+	start_conn_in_progress();
+  }
+
   ParodusInfo("Waiting with backoffRetryTime %d seconds\n", timer->delay);
   sleep (timer->delay);
 }  
@@ -391,10 +398,8 @@ int nopoll_connect (create_connection_ctx_t *ctx, int is_ipv6)
    }
    if ((NULL == connection) && (!is_ipv6)) {
      if((checkHostIp(server->server_addr) == -2)) {
-       if (check_timer_expired (&ctx->connect_timer, 15*60*1000) && !get_interface_down_event()) {
+       if (check_timer_expired (&ctx->connect_timer, 15*60*1000)) {
   	 ParodusError("WebPA unable to connect due to DNS resolving to 10.0.0.1 for over 15 minutes; crashing service.\n");
-	 OnboardLog("WebPA unable to connect due to DNS resolving to 10.0.0.1 for over 15 minutes; crashing service.\n");
-	 OnboardLog("Reconnect detected, setting Dns_Res_webpa_reconnect reason for Reconnect\n");
 	 set_global_reconnect_reason("Dns_Res_webpa_reconnect");
 	 set_global_reconnect_status(true);
 						
@@ -450,7 +455,6 @@ int wait_connection_ready (create_connection_ctx_t *ctx)
     /* clear auth token in cfg so that we will refetch auth token */
     memset (cfg->webpa_auth_token, 0, sizeof(cfg->webpa_auth_token));
     ParodusError("Received Unauthorized response with status: %d\n", wait_status);
-	OnboardLog("Received Unauthorized response with status: %d\n", wait_status);
     return WAIT_ACTION_RETRY;
   }
   ParodusError("Client connection timeout\n");	
@@ -580,26 +584,15 @@ int createNopollConnection(noPollCtx *ctx)
 	  if (keep_trying_to_connect (&conn_ctx, &backoff_timer))
 		break;
 	  // retry dns query
-
-	  // If close_retry is reset due to interface down event, stop retry
-	  // and wait till close_retry is set again.
-	  if(!get_close_retry() && get_interface_down_event()) {
-		pthread_mutex_lock(get_global_close_retry_mut());
-		pthread_cond_wait(get_global_close_retry_con(), get_global_close_retry_mut());
-		pthread_mutex_unlock (get_global_close_retry_mut());
-		//&conn_ctx.header_info->conveyHeader = getWebpaConveyHeader(); 
-	  }
 	}
       
 	if(conn_ctx.current_server->allow_insecure <= 0)
 	{
 		ParodusInfo("Connected to server over SSL\n");
-		OnboardLog("Connected to server over SSL\n");
 	}
 	else 
 	{
 		ParodusInfo("Connected to server\n");
-		OnboardLog("Connected to server\n");
 	}
 	
 	get_parodus_cfg()->cloud_status = CLOUD_STATUS_ONLINE;

src/crud_internal.c

@@ -1346,7 +1346,6 @@ static int ConnDisconnectFromCloud(char *disconn_reason)
 	if(!close_retry)
 	{
 		ParodusInfo("Reconnect detected, setting reason %s for Reconnect\n", disconn_reason);
-		OnboardLog("Reconnect detected, setting reason %s for Reconnect\n", disconn_reason);
 		set_global_reconnect_reason(disconn_reason);
 		set_global_reconnect_status(true);
 		set_close_retry();

src/downstream.c

@@ -121,9 +121,6 @@ void listenerOnMessage(void * msg, size_t msgSize)
                         ParodusInfo("Received downstream dest as :%s and transaction_uuid :%s\n", dest, 
                             ((WRP_MSG_TYPE__REQ   == msgType) ? message->u.req.transaction_uuid : 
                             ((WRP_MSG_TYPE__EVENT == msgType) ? "NA" : message->u.crud.transaction_uuid)));
-			OnboardLog("%s\n",
-                            ((WRP_MSG_TYPE__REQ   == msgType) ? message->u.req.transaction_uuid :
-                            ((WRP_MSG_TYPE__EVENT == msgType) ? "NA" : message->u.crud.transaction_uuid)));
                         
                         free(destVal);
 

src/heartBeat.c

@@ -22,10 +22,8 @@
  */
 
 #include "heartBeat.h"
-#include <stdbool.h>
 
 volatile unsigned int heartBeatTimer = 0;
-volatile bool paused = false;
 
 pthread_mutex_t heartBeat_mut=PTHREAD_MUTEX_INITIALIZER;
 
@@ -51,27 +49,8 @@ void reset_heartBeatTimer()
 void increment_heartBeatTimer(unsigned int inc_time_ms) 
 {
 	pthread_mutex_lock (&heartBeat_mut);
-	if (!paused)
-	  heartBeatTimer += inc_time_ms;
-	pthread_mutex_unlock (&heartBeat_mut);
-}
-
-// Pause heartBeatTimer, i.e. stop incrementing
-void pause_heartBeatTimer()
-{
-	pthread_mutex_lock (&heartBeat_mut);
-	heartBeatTimer = 0;
-	paused = true;
-	pthread_mutex_unlock (&heartBeat_mut);
-}
-
-// Resume heartBeatTimer, i.e. resume incrementing
-void resume_heartBeatTimer()
-{
-	pthread_mutex_lock (&heartBeat_mut);
-	paused = false;
+	heartBeatTimer += inc_time_ms;
 	pthread_mutex_unlock (&heartBeat_mut);
 }
 
 
-

src/heartBeat.h

@@ -39,12 +39,6 @@ void reset_heartBeatTimer();
 // Increment value of heartBeatTimer to desired value
 void increment_heartBeatTimer(unsigned int inc_time_ms);
 
-// Pause heartBeatTimer, i.e. stop incrementing
-void pause_heartBeatTimer();
-
-// Resume heartBeatTimer, i.e. resume incrementing
-void resume_heartBeatTimer();
-
 #ifdef __cplusplus
 }
 #endif

src/networking.c

@@ -70,7 +70,6 @@ int checkHostIp(char * serverIP)
 	if (retVal != 0) 
 	{
 		ParodusError("getaddrinfo: %s\n", gai_strerror(retVal));
-		OnboardLog("getaddrinfo: %s\n", gai_strerror(retVal));
 	}
 	else
 	{

src/nopoll_handlers.c

@@ -167,25 +167,16 @@ void listenerOnCloseMessage (noPollCtx * ctx, noPollConn * conn, noPollPtr user_
     if( closeStatus == 1006 && !get_global_reconnect_status())
     {
 	ParodusInfo("Reconnect detected, setting default Reconnect reason %s\n",defaultReason);
-	OnboardLog("Reconnect detected, setting default Reconnect reason %s\n",defaultReason);
         set_global_reconnect_reason(defaultReason);
         set_global_reconnect_status(true);
     }
     else if(!get_global_reconnect_status())
     {
     	ParodusInfo("Reconnect detected, setting Reconnect reason as Unknown\n");
-	OnboardLog("Reconnect detected, setting Reconnect reason as Unknown\n");
         set_global_reconnect_reason("Unknown");
     }
-    
-    if(!get_interface_down_event())
-    {
-	ParodusInfo("Setting the close and retry connection\n");
-    	set_close_retry();
-    }
-    else
-    	ParodusInfo("Not Setting the close and retry connection as interface is down\n");
 
+    set_close_retry();
     ParodusPrint("listenerOnCloseMessage(): mutex unlock in producer thread\n");
 }
 

src/nopoll_helpers.c

@@ -73,35 +73,25 @@ void sendMessage(noPollConn *conn, void *msg, size_t len)
     else
     {
                 ParodusError("Failed to send msg upstream as connection is not OK\n");
-                OnboardLog("Failed to send msg upstream as connection is not OK\n");
+		if (connErr == 0)
+		{
+			getCurrentTime(connStuck_startPtr);
+			ParodusInfo("Conn got stuck, initialized the first timer\n");
+			connErr = 1;
+		}
+		else
+		{
+			getCurrentTime(connStuck_endPtr);
+			timeDiff = timeValDiff(connStuck_startPtr, connStuck_endPtr);
+			ParodusPrint("checking timeout difference:%ld\n", timeDiff);
 
-                if(get_interface_down_event())
-                {     
-                     ParodusError("Unable to connect to server since interface is down\n");
-                }
-                else
-                {
-			if (connErr == 0)
+			if( timeDiff >= (10*60*1000))
 			{
-				getCurrentTime(connStuck_startPtr);
-				ParodusInfo("Conn got stuck, initialized the first timer\n");
-				connErr = 1;
+				ParodusError("conn got stuck for over 10 minutes; crashing service.\n");
+				kill(getpid(),SIGTERM);
 			}
-			else
-			{
-				getCurrentTime(connStuck_endPtr);
-				timeDiff = timeValDiff(connStuck_startPtr, connStuck_endPtr);
-				ParodusPrint("checking timeout difference:%ld\n", timeDiff);
 
-				if( timeDiff >= (10*60*1000))
-				{
-					ParodusError("conn got stuck for over 10 minutes; crashing service.\n");
-					OnboardLog("conn got stuck for over 10 minutes; crashing service.\n");
-					kill(getpid(),SIGTERM);
-				}
-
-			}
-                 }
+		}
     }
 }
 
@@ -159,7 +149,6 @@ void __report_log (noPollCtx * ctx, noPollDebugLevel level, const char * log_msg
     if (level == NOPOLL_LEVEL_CRITICAL) 
     {
         ParodusError("%s\n", log_msg );
-	OnboardLog("%s\n", log_msg );
     }
     return;
 }

src/parodus_log.h

@@ -33,9 +33,3 @@
 #define ParodusError(...)                   cimplog_error(LOGGING_MODULE, __VA_ARGS__)
 #define ParodusInfo(...)                    cimplog_info(LOGGING_MODULE, __VA_ARGS__)
 #define ParodusPrint(...)                   cimplog_debug(LOGGING_MODULE, __VA_ARGS__)
-#ifdef FEATURE_SUPPORT_ONBOARD_LOGGING
-#define OnboardLog(...)                     onboarding_log(LOGGING_MODULE, __VA_ARGS__)
-#else
-#define OnboardLog(...)
-#endif
-

src/partners_check.c

@@ -178,7 +178,6 @@ int validate_partner_id(wrp_msg_t *msg, partners_t **partnerIds)
                 if(matchFlag != 1)
                 {
                     ParodusError("Invalid partner_id %s\n",temp);
-                    OnboardLog("Invalid partner_id %s\n",temp);
                     if(partnersList != NULL)
                     {
                         for(j=0; j<partnersList->count; j++)

src/token.c

@@ -139,7 +139,6 @@ int analyze_jwt (const cjwt_t *jwt, char **url_buf, unsigned int *port)
 		show_times (exp_time, cur_time);
 		if (exp_time < cur_time) {
 			ParodusError ("JWT has expired\n");
-			OnboardLog ("JWT has expired\n");
 			return TOKEN_ERR_JWT_EXPIRED;
 		}
 	}
@@ -147,7 +146,6 @@ int analyze_jwt (const cjwt_t *jwt, char **url_buf, unsigned int *port)
 		url_buf, port);
 	if (http_match < 0) {
 		ParodusError ("Invalid endpoint claim in JWT\n");
-		OnboardLog("Invalid endpoint claim in JWT\n");
 		return TOKEN_ERR_BAD_ENDPOINT;
 	}
 	ParodusInfo ("JWT is_http strncmp: %d\n", http_match);

src/upstream.c

@@ -589,7 +589,6 @@ void sendUpstreamMsgToServer(void **resp_bytes, size_t resp_size)
 		else
 		{
 			ParodusInfo("close_retry is %d, unable to send response as connection retry is in progress\n", close_retry);
-			OnboardLog("close_retry is %d, unable to send response as connection retry is in progress\n", close_retry);
 		}
 		free(appendData);
 		appendData =NULL;

tests/CMakeLists.txt

@@ -117,13 +117,13 @@ target_link_libraries (test_nopoll_handlers_fragment -lnopoll -lcunit -lcimplog
 #-------------------------------------------------------------------------------
 #   test_connection
 #-------------------------------------------------------------------------------
-#add_test(NAME test_connection COMMAND ${MEMORY_CHECK} ./test_connection)
-#set (CONN_SRC ../src/connection.c 
-#  ../src/string_helpers.c ../src/mutex.c ../src/time.c 
-#  ../src/config.c ../src/auth_token.c ../src/spin_thread.c  ../src/heartBeat.c ../src/close_retry.c)
+add_test(NAME test_connection COMMAND ${MEMORY_CHECK} ./test_connection)
+set (CONN_SRC ../src/connection.c 
+  ../src/string_helpers.c ../src/mutex.c ../src/time.c 
+  ../src/config.c ../src/auth_token.c ../src/spin_thread.c  ../src/heartBeat.c ../src/close_retry.c)
 #set(CONN_SRC ../src/connection.c ${PARODUS_COMMON_SRC})
-#add_executable(test_connection test_connection.c ${CONN_SRC})
-#target_link_libraries (test_connection ${PARODUS_COMMON_LIBS} -lcmocka -lcurl -luuid)
+add_executable(test_connection test_connection.c ${CONN_SRC})
+target_link_libraries (test_connection ${PARODUS_COMMON_LIBS} -lcmocka -lcurl -luuid)
 
 #-------------------------------------------------------------------------------
 #   test_connection - function createNopollConnection

tests/test_nopoll_handlers.c

@@ -21,7 +21,6 @@
 #include <nopoll_private.h>
 #include <pthread.h>
 
-#include "../src/ParodusInternal.h"
 #include "../src/nopoll_handlers.h"
 #include "../src/parodus_log.h"
 
@@ -47,11 +46,6 @@ bool get_global_reconnect_status()
     return LastReasonStatus;
 }
 
-bool get_interface_down_event()
-{
-     return false;
-}
-
 void set_global_reconnect_status(bool status)
 {
     (void) status ;

tests/test_nopoll_handlers_fragment.c

@@ -48,11 +48,6 @@ bool get_global_reconnect_status()
     return LastReasonStatus;
 }
 
-bool get_interface_down_event()
-{
-     return false;
-}
-
 void set_global_reconnect_status(bool status)
 {
     (void) status ;

tests/test_nopoll_helpers.c

@@ -16,7 +16,6 @@
  
 #include <stdarg.h>
 #include <stddef.h>
-#include <stdbool.h>
 #include <setjmp.h>
 #include <cmocka.h>
 #include <nopoll.h>
@@ -117,11 +116,6 @@ int kill(pid_t pid, int sig)
     return (int) mock();
 }
 
-bool get_interface_down_event()
-{
-     return false;
-}
-
 /*----------------------------------------------------------------------------*/
 /*                                   Tests                                    */
 /*----------------------------------------------------------------------------*/