Merge branch 'dev-1.1.4' of github.com:WeDataSphere/DataSphereStudio into dev-1.1.4

Author: demonray

dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/lock/DSSFlowEditLockManager.java

@@ -172,8 +172,9 @@ public static void deleteLock(String flowEditLock) throws DSSErrorException {
         try {
             if (StringUtils.isNotBlank(flowEditLock)) {
                 DSSFlowEditLock dssFlowEditLock = lockMapper.getFlowEditLockByLockContent(flowEditLock);
-                Long flowId = Optional.ofNullable(dssFlowEditLock).map(DSSFlowEditLock::getFlowID).get();
-                lockMapper.clearExpire(sdf.get().format(new Date(System.currentTimeMillis() - DSSWorkFlowConstant.DSS_FLOW_EDIT_LOCK_TIMEOUT.getValue())), flowId);
+                if (dssFlowEditLock != null) {
+                    lockMapper.clearExpire(sdf.get().format(new Date(System.currentTimeMillis() - DSSWorkFlowConstant.DSS_FLOW_EDIT_LOCK_TIMEOUT.getValue())), dssFlowEditLock.getFlowID());
+                }
             }
         } catch (Exception e) {
             LOGGER.error("flowEditLock delete failed，flowId：{}", flowEditLock, e);

sbin/dss-start-all.sh

@@ -87,20 +87,25 @@ function startDssProject(){
 	startApp
 	sleep 15
 
- echo "------------------------Start check whether the  project service is registered to eureka successfully-----------------------------"
+ echo "------------------------Start to check whether the project service is registered to eureka successfully-----------------------------"
   #project服务启动并注册到eureka后再启动其他服务
-  while [[ -z $result ]]
+  i=1
+  while [[ -z $result ]] && [[ $i -le 24 ]]
   do
     sleep 5
-    if [ -z $EUREKA_USERNAME ] || [ -z $EUREKA_PASSWORD ];
-      then
+    if [ -z $EUREKA_USERNAME ] || [ -z $EUREKA_PASSWORD ];then
         response=`curl  http://${EUREKA_INSTALL_IP}:${EUREKA_PORT}/eureka/apps/DSS-FRAMEWORK-PROJECT-SERVER`
-      else
+    else
         response=`curl  http://${EUREKA_USENAME}:${EUREKA_PASSWORD}@${EUREKA_INSTALL_IP}:${EUREKA_PORT}/eureka/apps/DSS-FRAMEWORK-PROJECT-SERVER`
     fi
+    let i++
   result=$(echo $response |grep 'DSS-FRAMEWORK-PROJECT-SERVER')
   done
-  echo "------------------------the   project service is registered to eureka successfully------------------------------------------------"
+  if [[ $i -eq 25 ]]; then
+      echo "the project server start failed in two minutes,please check the log to find more error details."
+      exit
+  fi
+  echo "------------------------the project service is registered to eureka successfully------------------------------------------------"
 
 	SERVER_NAME=dss-framework-orchestrator-server
 	SERVER_IP=$DSS_FRAMEWORK_ORCHESTRATOR_SERVER_INSTALL_IP