Merge pull request #418 from sadhyama/lowqos_retry

XmidtSendData to handle higher priority low qos
xmidt-org · Mar 30, 2023 · 502f564 · 502f564
2 parents 1a7ae0b + 3e557ae
commit 502f564
Showing 1 changed file with 47 additions and 11 deletions.
diff --git a/src/xmidtsend_rbus.c b/src/xmidtsend_rbus.c
@@ -70,6 +70,22 @@ bool highQosValueCheck(int qos)
 	return false;
 }
 
+//To handle high priority low qos message to confirm send success and ignore cloud ack.
+bool higherPriorityLowQosCheck(int qos)
+{
+	if(qos > 20 && qos < 25)
+	{
+		ParodusInfo("The low qos msg with higher priority\n");
+		return true;
+	}
+	else
+	{
+		ParodusPrint("The qos is not higher priority low qos\n");
+	}
+
+	return false;
+}
+
 XmidtMsg * get_global_xmidthead(void)
 {
     XmidtMsg *tmp = NULL;
@@ -214,8 +230,15 @@ int xmidtQOptmize()
 			{
 				if(get_XmidtQsize() > 0 && get_XmidtQsize() == get_parodus_cfg()->max_queue_size)
 				{
-					ParodusInfo("Max queue size reached, delete low qos %d transid %s\n", tempMsg->u.event.qos, tempMsg->u.event.transaction_uuid);
-					del = 2;
+					if(higherPriorityLowQosCheck(tempMsg->u.event.qos))
+					{
+						ParodusInfo("Skip max queue size delete for qos %d transid %s\n", tempMsg->u.event.qos, tempMsg->u.event.transaction_uuid);
+					}
+					else
+					{
+						ParodusInfo("Max queue size reached, delete low qos %d transid %s\n", tempMsg->u.event.qos, tempMsg->u.event.transaction_uuid);
+						del = 2;
+					}
 				}
 			}
 		}
@@ -746,7 +769,7 @@ int sendXmidtEventToServer(XmidtMsg *msgnode, wrp_msg_t * msg, rbusMethodAsyncHa
 		while(sendRetStatus)     //If SendMessage is failed condition
 		{
 			ParodusError("sendXmidtEventToServer is Failed\n");
-			if(highQosValueCheck(qos))
+			if((highQosValueCheck(qos)) || (higherPriorityLowQosCheck(qos)))
 			{
 				ParodusPrint("The event is having high qos retry again\n");
 				ParodusInfo("Wait till connection is Up\n");
@@ -797,13 +820,26 @@ int sendXmidtEventToServer(XmidtMsg *msgnode, wrp_msg_t * msg, rbusMethodAsyncHa
 			}
 			else
 			{
-				ParodusInfo("Low qos event, send success callback and delete\n");
-				mapXmidtStatusToStatusMessage(DELIVERED_SUCCESS, &errorMsg);
-				ParodusPrint("statusMsg is %s\n",errorMsg);
-				createOutParamsandSendAck(msg, asyncHandle, errorMsg, DELIVERED_SUCCESS, NULL, RBUS_ERROR_SUCCESS);
-				//print_xmidMsg_list();
-				updateXmidtState(msgnode, DELETE);
-				print_xmidMsg_list();
+				if(higherPriorityLowQosCheck(qos))
+				{
+					ParodusInfo("Higher priority low qos send success, ignore cloud ack\n");
+					mapXmidtStatusToStatusMessage(DELIVERED_SUCCESS, &errorMsg);
+					printSendMsgData(errorMsg, notif_wrp_msg->u.event.qos, notif_wrp_msg->u.event.dest, notif_wrp_msg->u.event.transaction_uuid);
+					createOutParamsandSendAck(msg, asyncHandle, errorMsg, DELIVERED_SUCCESS, NULL, RBUS_ERROR_SUCCESS);
+					ParodusPrint("update state to DELETE\n");
+					updateXmidtState(msgnode, DELETE);
+					print_xmidMsg_list();
+				}
+				else
+				{
+					ParodusInfo("Low qos event, send success callback and delete\n");
+					mapXmidtStatusToStatusMessage(DELIVERED_SUCCESS, &errorMsg);
+					ParodusPrint("statusMsg is %s\n",errorMsg);
+					createOutParamsandSendAck(msg, asyncHandle, errorMsg, DELIVERED_SUCCESS, NULL, RBUS_ERROR_SUCCESS);
+					//print_xmidMsg_list();
+					updateXmidtState(msgnode, DELETE);
+					print_xmidMsg_list();
+				}
 			}
 		}
 
@@ -1631,7 +1667,7 @@ void checkMaxQandOptimize(XmidtMsg *xmdMsg)
 			wrp_msg_t * tempMsg = temp->msg;
 			qos = tempMsg->u.event.qos;
 			ParodusPrint("qos is %d\n", qos);
-			if(highQosValueCheck(qos))
+			if((highQosValueCheck(qos)) || (higherPriorityLowQosCheck(qos)))
 			{
 				ParodusPrint("High qos msg, skip delete\n");
 			}