Merge pull request #118 from FlowCI/develop

Develop

Author: yang.guo

.gitignore

@@ -6,6 +6,7 @@ api-doc/
 
 node_modules/
 apidoc/
+dist/
 logs/
 target/
 pom.xml.tag

platform-agent/pom.xml

@@ -12,7 +12,7 @@
   <artifactId>platform-agent</artifactId>
 
   <properties>
-    <client.version>0.0.7</client.version>
+    <agent.version>0.1.0</agent.version>
   </properties>
 
   <dependencies>
@@ -96,8 +96,6 @@
   </dependencies>
 
   <build>
-    <finalName>flow-agent-${client.version}</finalName>
-
     <resources>
       <resource>
         <directory>src/main/resources</directory>
@@ -124,14 +122,16 @@
               <goal>shade</goal>
             </goals>
             <configuration>
+              <finalName>flow-agent-${agent.version}</finalName>
               <transformers>
                 <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                   <manifestEntries>
                     <Main-Class>com.flow.platform.agent.App</Main-Class>
-                    <Build-Number>${client.version}</Build-Number>
+                    <Build-Number>${agent.version}</Build-Number>
                   </manifestEntries>
                 </transformer>
               </transformers>
+              <outputDirectory>${project.build.directory}/../../dist</outputDirectory>
             </configuration>
           </execution>
         </executions>

platform-agent/src/main/java/com/flow/platform/agent/AgentManager.java

@@ -107,25 +107,38 @@ public void run() {
     public void childEvent(CuratorFramework client, TreeCacheEvent event) throws Exception {
         ChildData eventData = event.getData();
 
+        if (event.getType() == Type.CONNECTION_RECONNECTED) {
+            LOGGER.traceMarker("ZK-Event", "========= Reconnect =========");
+            registerZkNodeAndWatch();
+            return;
+        }
+
         if (event.getType() == Type.CONNECTION_LOST) {
-            LOGGER.traceMarker("ZK-Event", "========= Connection lost from zk server =========");
+            LOGGER.traceMarker("ZK-Event", "========= Lost =========");
             return;
         }
 
         if (event.getType() == Type.INITIALIZED) {
-            LOGGER.traceMarker("ZK-Event", "========= Connected to zk server =========");
+            LOGGER.traceMarker("ZK-Event", "========= Initialized =========");
             return;
         }
 
         if (event.getType() == Type.NODE_ADDED) {
-            LOGGER.traceMarker("ZK-Event", "========= Node been created: %s =========", eventData.getPath());
+            LOGGER.traceMarker("ZK-Event", "========= Node Added: %s =========", eventData.getPath());
             return;
         }
 
         if (event.getType() == Type.NODE_UPDATED) {
+            LOGGER.traceMarker("ZK-Event", "========= Node Updated: %s =========", eventData.getPath());
             onDataChanged(eventData.getPath());
             return;
         }
+
+        if (event.getType() == Type.NODE_REMOVED) {
+            LOGGER.traceMarker("ZK-Event", "========= Node Removed: %s =========", eventData.getPath());
+            close();
+            return;
+        }
     }
 
     @Override
@@ -159,10 +172,15 @@ private void onDataChanged(String path) {
             }
 
             cmd = Jsonable.parse(rawData, Cmd.class);
-            cmdHistory.add(cmd);
+            if (cmd == null) {
+                LOGGER.warn("Unable to parse cmd from zk node: " + new String(rawData));
+                return;
+            }
 
+            cmdHistory.add(cmd);
             LOGGER.trace("Received command: " + cmd.toString());
             CmdManager.getInstance().execute(cmd);
+
         } catch (Throwable e) {
             LOGGER.error("Invalid cmd from server", e);
             // TODO: should report agent status directly...

platform-agent/src/main/java/com/flow/platform/agent/CmdManager.java

@@ -237,18 +237,19 @@ private String collectionAgentInfo() {
         String javaVersion = System.getProperty("java.version");
         String osName = System.getProperty("os.name");
         Runtime runtime = Runtime.getRuntime();
-        int kb = 1024;
         long total = runtime.totalMemory();
         long free = runtime.freeMemory();
         long use = total - free;
+
         Map<String, String> dic = new HashMap<>(7);
         dic.put("javaVersion", javaVersion);
         dic.put("osName", osName);
-        dic.put("totalMemory", total / kb + "MB");
-        dic.put("useMemory", use / kb + "MB");
+        dic.put("totalMemory", Long.toString(total));
+        dic.put("useMemory", Long.toString(use));
         dic.put("zone", Config.zone());
         dic.put("name", Config.name());
         dic.put("agentVersion", Config.getProperty("version"));
+
         return Jsonable.GSON_CONFIG.toJson(dic);
     }
 

platform-agent/src/main/java/com/flow/platform/agent/Config.java

@@ -20,6 +20,7 @@
 import com.flow.platform.domain.Jsonable;
 import com.flow.platform.util.ExceptionUtil;
 import com.flow.platform.util.Logger;
+import com.flow.platform.util.StringUtil;
 import com.flow.platform.util.http.HttpClient;
 import com.flow.platform.util.http.HttpResponse;
 import com.flow.platform.util.zk.ZKClient;
@@ -77,14 +78,13 @@ public static int zkTimeout() {
      */
     public static String getProperty(String name) {
         String value;
-        URL resource = Config.class.getClassLoader().getResource("application.properties");
         if (properties == null) {
-            try (InputStream fileInputStream = new FileInputStream(resource.getFile())) {
+            try (InputStream fileInputStream = Config.class.getResourceAsStream("/application.properties")) {
                 properties = new Properties();
                 properties.load(fileInputStream);
             } catch (Throwable e) {
-                LOGGER.warn("get property from application.properties error %s",
-                    ExceptionUtil.findRootCause(e).getMessage());
+                LOGGER.error("Fail to load application.properties:", e);
+                return StringUtil.EMPTY;
             }
         }
 

platform-api/pom.xml

@@ -13,15 +13,20 @@
   <artifactId>platform-api</artifactId>
   <packaging>war</packaging>
 
+  <properties>
+    <api.version>0.1.0</api.version>
+  </properties>
+
   <build>
-    <finalName>flow-api</finalName>
+    <finalName>flow-api-${api.version}</finalName>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-war-plugin</artifactId>
         <version>3.1.0</version>
         <configuration>
           <failOnMissingWebXml>false</failOnMissingWebXml>
+          <outputDirectory>${project.build.directory}/../../dist</outputDirectory>
         </configuration>
       </plugin>
     </plugins>

platform-api/src/main/java/com/flow/platform/api/controller/AgentController.java

@@ -22,7 +22,6 @@
 import com.flow.platform.api.events.AgentStatusChangeEvent;
 import com.flow.platform.api.service.AgentService;
 import com.flow.platform.core.exception.IllegalParameterException;
-import com.flow.platform.core.service.ApplicationEventService;
 import com.flow.platform.domain.Agent;
 import com.flow.platform.domain.AgentPath;
 import com.flow.platform.domain.AgentSettings;
@@ -42,7 +41,7 @@
  */
 @RestController
 @RequestMapping(path = "/agents")
-public class AgentController extends ApplicationEventService {
+public class AgentController {
 
     @Autowired
     private AgentService agentService;
@@ -193,7 +192,7 @@ public BooleanValue shutDown(@RequestParam String zone,
      */
     @PostMapping(path = "/callback")
     public void callback(@RequestBody Agent agent) {
-        this.dispatchEvent(new AgentStatusChangeEvent(this, agent));
+        agentService.onAgentStatusChange(agent);
     }
 
     /**

platform-api/src/main/java/com/flow/platform/api/dao/job/JobDao.java

@@ -69,6 +69,11 @@ public interface JobDao extends BaseDao<BigInteger, Job> {
      */
     Job get(String path, Integer number);
 
+    /**
+     * get job by session id
+     */
+    Job get(String sessionId);
+
     /**
      * get max build number for node path
      */

platform-api/src/main/java/com/flow/platform/api/dao/job/JobDaoImpl.java

@@ -87,6 +87,8 @@ public Job get(BigInteger key) {
         });
     }
 
+
+
     @Override
     public List<Job> latestByPath(List<String> paths) {
         return execute((Session session) -> {
@@ -163,6 +165,13 @@ public Job get(String path, Integer number) {
         });
     }
 
+    @Override
+    public Job get(String sessionId) {
+        return execute(session -> session.createQuery("from Job where sessionId = :sessionId", Job.class)
+            .setParameter("sessionId", sessionId)
+            .uniqueResult());
+    }
+
     @Override
     public Integer maxBuildNumber(String path) {
         return execute((Session session) -> {

platform-api/src/main/java/com/flow/platform/api/domain/envs/FlowEnvs.java

@@ -42,7 +42,7 @@ public enum FlowEnvs implements EnvKey {
     /**
      * Defined env variable output prefix
      */
-    FLOW_OUTPUT_ENV_PREFIX;
+    FLOW_ENV_OUTPUT_PREFIX;
 
     public enum StatusValue implements EnvValue {