Merge pull request #4972 from wangkx/h9882

HPCC-9882 Check and return exception message from removeEntry()

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>

esp/services/ws_dfu/ws_dfuService.cpp

@@ -1181,13 +1181,9 @@ bool CWsDfuEx::DFUDeleteFiles(IEspContext &context, IEspDFUArrayActionRequest &r
                         superFileNames.append(filename);
                     }
                 }
-                if (!fdir.removeEntry(filename, userdesc, NULL, REMOVE_FILE_SDS_CONNECT_TIMEOUT))
-                    returnStr.appendf("<Message><Value>Failed to delete %s</Value></Message>", filename);
-                else
-                {
-                    PROGLOG("Deleted Logical File: %s by: %s\n",filename, username.str());
-                    returnStr.appendf("<Message><Value>Deleted File %s</Value></Message>", filename);
-                }
+                fdir.removeEntry(filename, userdesc, NULL, REMOVE_FILE_SDS_CONNECT_TIMEOUT, true);
+                PROGLOG("Deleted Logical File: %s by: %s\n",filename, username.str());
+                returnStr.appendf("<Message><Value>Deleted File %s</Value></Message>", filename);
             }
             catch(IException* e)
             {

esp/smc/SMCLib/LogicFileWrapper.cpp

@@ -26,6 +26,8 @@
 // Construction/Destruction
 //////////////////////////////////////////////////////////////////////
 
+#define REMOVE_FILE_SDS_CONNECT_TIMEOUT (1000*15)  // 15 seconds
+
 LogicFileWrapper::LogicFileWrapper()
 {
 
@@ -77,13 +79,9 @@ bool LogicFileWrapper::doDeleteFile(const char* logicalName,const char *cluster,
             }
         }
 
-        if (!fdir.removeEntry(cname.str(), udesc))
-            returnStr.appendf("<Message><Value>Failed to delete %s</Value></Message>", cname.str());
-        else
-        {
-            returnStr.appendf("<Message><Value>Deleted File %s</Value></Message>", cname.str());
-            DBGLOG("%s", returnStr.str());
-        }
+        fdir.removeEntry(cname.str(), udesc, NULL, REMOVE_FILE_SDS_CONNECT_TIMEOUT, true);
+        returnStr.appendf("<Message><Value>Deleted File %s</Value></Message>", cname.str());
+        DBGLOG("%s", returnStr.str());
         return true;
     }
     catch (IException *e)