Merge pull request #5032 from FederatedAI/feature-2.0.0-beta-osx-new

Feature 2.0.0 beta osx new

java/osx/bin/common.sh

@@ -14,9 +14,7 @@
 #  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
-#
-error_exit ()
-{
+error_exit (){
     echo "ERROR: $1 !!"
     exit 1
 }
@@ -74,6 +72,8 @@ choose_gc_options()
       JAVA_OPT="${JAVA_OPT} -XX:+UseG1GC -XX:G1HeapRegionSize=16m -XX:G1ReservePercent=25 -XX:InitiatingHeapOccupancyPercent=30 -XX:SoftRefLRUPolicyMSPerMB=0"
       JAVA_OPT="${JAVA_OPT} -Xlog:gc*:file=${GC_LOG_DIR}/rmq_srv_gc_%p_%t.log:time,tags:filecount=5,filesize=30M"
     fi
+
+    JAVA_OPT="${JAVA_OPT} -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=${BASE_DIR}/oom/heapdump.hprof "
 }
 
 choose_gc_log_directory
@@ -92,7 +92,7 @@ getpid() {
     pid=$(cat ./bin/broker.pid)
   fi
   if [[ -n ${pid} ]]; then
-    count=$(ps -ef | grep $pid |grep 'com.osx' | grep -v "grep" | wc -l)
+    count=$(ps -ef | grep $pid | grep -v "grep" | wc -l)
     if [[ ${count} -eq 0 ]]; then
       rm ./bin/broker.pid
       unset pid
@@ -110,7 +110,7 @@ mklogsdir() {
 start() {
   echo "try to start $1"
   module=broker
-  main_class=com.osx.broker.Bootstrap
+  main_class= org.fedai.osx.broker.Bootstrap
   getpid $module
   if [[ ! -n ${pid} ]]; then   JAVA_OPT="${JAVA_OPT}  "
     mklogsdir
@@ -135,7 +135,7 @@ start() {
 debug() {
   echo "try to start $1"
   module=broker
-  main_class=com.osx.broker.Bootstrap
+  main_class= org.fedai.osx.broker.Bootstrap
   getpid $module
   if [[ ! -n ${pid} ]]; then   JAVA_OPT="${JAVA_OPT}  "
     mklogsdir
@@ -208,4 +208,4 @@ inspect_pid() {
        fi
     done
   fi
-}
+}

java/osx/bin/service.sh

@@ -1,5 +1,4 @@
 #!/bin/bash
-
 #
 #  Copyright 2019 The FATE Authors. All Rights Reserved.
 #
@@ -15,7 +14,7 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 #
-set -e 
+set -e
 source ./bin/common.sh
 #export JAVA_HOME=/data/projects/fate/common/jdk/jdk-8u192
 #export PATH=$PATH:$JAVA_HOME/bin
@@ -60,4 +59,4 @@ case "$1" in
     *)
         echo "usage: $0 {start|stop|status|restart}"
         exit 1
-esac
+esac

java/osx/osx-api/src/main/java/com/osx/api/constants/Protocol.java → java/osx/osx-api/src/main/java/org/fedai/osx/api/constants/Protocol.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.osx.api.constants;
+package org.fedai.osx.api.constants;
 
 public enum Protocol {
     grpc,

java/osx/osx-api/src/main/java/com/osx/api/context/Context.java → java/osx/osx-api/src/main/java/org/fedai/osx/api/context/Context.java

@@ -1,7 +1,7 @@
-package com.osx.api.context;
+package org.fedai.osx.api.context;
 
-import com.osx.api.constants.Protocol;
-import com.osx.api.router.RouterInfo;
+import org.fedai.osx.api.constants.Protocol;
+import org.fedai.osx.api.router.RouterInfo;
 
 public interface Context {
     public String getTechProviderCode() ;

java/osx/osx-api/src/main/java/com/osx/api/router/RouterInfo.java → java/osx/osx-api/src/main/java/org/fedai/osx/api/router/RouterInfo.java

@@ -14,9 +14,8 @@
  * limitations under the License.
  */
 
-package com.osx.api.router;
-import com.osx.api.constants.Protocol;
-
+package org.fedai.osx.api.router;
+import org.fedai.osx.api.constants.Protocol;
 
 
 public class RouterInfo {

java/osx/osx-api/src/main/java/com/osx/api/tech/provider/TechProvider.java → java/osx/osx-api/src/main/java/org/fedai/osx/api/tech/provider/TechProvider.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.osx.api.tech.provider;
+package org.fedai.osx.api.tech.provider;
 import io.grpc.stub.StreamObserver;
 import org.ppc.ptp.Osx;
 import javax.servlet.http.HttpServletRequest;

java/osx/osx-api/src/main/java/com/osx/api/translator/Translator.java → java/osx/osx-api/src/main/java/org/fedai/osx/api/translator/Translator.java

@@ -1,7 +1,7 @@
-package com.osx.api.translator;
+package org.fedai.osx.api.translator;
 
 
-import com.osx.api.context.Context;
+import org.fedai.osx.api.context.Context;
 import org.ppc.ptp.Osx;
 //用于转换不同厂商通信时的接收和发总数据，
 public interface Translator {

java/osx/osx-broker/src/main/java/com/osx/broker/Bootstrap.java → java/osx/osx-broker/src/main/java/org/fedai/osx/broker/Bootstrap.java

@@ -13,18 +13,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.osx.broker;
-import com.osx.core.config.MetaInfo;
-import com.osx.core.jvm.JvmInfoCounter;
-import com.osx.core.utils.PropertiesUtil;
-import com.osx.core.utils.ServerUtil;
+package org.fedai.osx.broker;
+
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.Option;
 import org.apache.commons.cli.Options;
 import org.apache.commons.cli.PosixParser;
 import org.apache.commons.lang3.StringUtils;
+import org.fedai.osx.core.config.MetaInfo;
+import org.fedai.osx.core.jvm.JvmInfoCounter;
+import org.fedai.osx.core.utils.PropertiesUtil;
+import org.fedai.osx.core.utils.ServerUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import java.util.Properties;
 public class Bootstrap {
     static Logger logger = LoggerFactory.getLogger(Bootstrap.class);