Pārlūkot izejas kodu

HPCC-19019 Return "roxie too busy" when RoxieControlLock fails.

Signed-off-by: wangkx <kevin.wang@lexisnexis.com>
wangkx 7 gadi atpakaļ
vecāks
revīzija
7d3c568234

+ 1 - 1
common/roxiecommlib/roxiecommunicationclient.cpp

@@ -321,7 +321,7 @@ public:
     {
     {
         unsigned start = msTick();
         unsigned start = msTick();
         if (!sendRoxieControlLock(sock, allOrNothing, wait))
         if (!sendRoxieControlLock(sock, allOrNothing, wait))
-            throw MakeStringException(-1, "Roxie control:lock failed");
+            throw MakeStringException(-1, "Roxie is too busy (control:lock failed) - please try again later.");
         return sendRoxieControlQuery(sock, msg, remainingMsWait(wait, start));
         return sendRoxieControlQuery(sock, msg, remainingMsWait(wait, start));
     }
     }
 
 

+ 1 - 1
esp/clients/roxiecontrol.cpp

@@ -96,7 +96,7 @@ IPropertyTree *sendRoxieControlAllNodes(ISocket *sock, const char *msg, bool all
 {
 {
     unsigned start = msTick();
     unsigned start = msTick();
     if (!sendRoxieControlLock(sock, allOrNothing, wait))
     if (!sendRoxieControlLock(sock, allOrNothing, wait))
-        throw MakeStringException(-1, "Roxie control:lock failed");
+        throw MakeStringException(-1, "Roxie is too busy (control:lock failed) - please try again later.");
     return sendRoxieControlQuery(sock, msg, remainingMsWait(wait, start));
     return sendRoxieControlQuery(sock, msg, remainingMsWait(wait, start));
 }
 }