Skip to content
Snippets Groups Projects
Commit 1ceb5b2e authored by Jesper Fyhr Knudsen's avatar Jesper Fyhr Knudsen
Browse files

Add agent current queue and currently running counts

parent 6480e3b9
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 383 additions and 189 deletions
octopus-java/.idea/workspace.xml
+ 239
− 83
View file @ 1ceb5b2e
......@@ -2,17 +2,11 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="057f0053-f4e8-40ac-9d01-6a2f351d655a" name="Default" comment="">
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/octopus-commons/src/main/java/com/chaos/sdk/v6/dto/ClusterState.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/octopus-server/src/main/java/com/chaos/octopus/server/AgentProxy.java" afterPath="$PROJECT_DIR$/octopus-server/src/main/java/com/chaos/octopus/server/AgentProxy.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/octopus-server/src/main/java/com/chaos/octopus/server/AllocationHandler.java" afterPath="$PROJECT_DIR$/octopus-server/src/main/java/com/chaos/octopus/server/AllocationHandler.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/octopus-commons/src/main/java/com/chaos/sdk/AuthenticatedChaosClient.java" afterPath="$PROJECT_DIR$/octopus-commons/src/main/java/com/chaos/sdk/AuthenticatedChaosClient.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/octopus-commons/src/test/java/com/chaos/sdk/test/ChaosTest.java" afterPath="$PROJECT_DIR$/octopus-commons/src/test/java/com/chaos/sdk/test/ChaosTest.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/octopus-server/src/main/java/com/chaos/octopus/server/synchronization/Heartbeat.java" afterPath="$PROJECT_DIR$/octopus-server/src/main/java/com/chaos/octopus/server/synchronization/Heartbeat.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/octopus-commons/src/main/java/com/chaos/sdk/HeartbeatGateway.java" afterPath="$PROJECT_DIR$/octopus-commons/src/main/java/com/chaos/sdk/HeartbeatGateway.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/octopus-server/src/test/java/com/chaos/octopus/server/unit/Synchronization/HeartbeatTest.java" afterPath="$PROJECT_DIR$/octopus-server/src/test/java/com/chaos/octopus/server/unit/Synchronization/HeartbeatTest.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/octopus-commons/src/main/java/com/chaos/octopus/commons/util/NetworkingUtil.java" afterPath="$PROJECT_DIR$/octopus-commons/src/main/java/com/chaos/octopus/commons/util/NetworkingUtil.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/octopus-server/src/main/java/com/chaos/octopus/server/OrchestratorImpl.java" afterPath="$PROJECT_DIR$/octopus-server/src/main/java/com/chaos/octopus/server/OrchestratorImpl.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/codeStyleSettings.xml" afterPath="$PROJECT_DIR$/.idea/codeStyleSettings.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/octopus-agent/src/main/java/com/chaos/octopus/agent/Agent.java" afterPath="$PROJECT_DIR$/octopus-agent/src/main/java/com/chaos/octopus/agent/Agent.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/octopus-agent/src/test/java/com/chaos/octopus/agent/unit/AgentTest.java" afterPath="$PROJECT_DIR$/octopus-agent/src/test/java/com/chaos/octopus/agent/unit/AgentTest.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/octopus-commons/src/main/java/com/chaos/sdk/v6/dto/ClusterState.java" afterPath="$PROJECT_DIR$/octopus-commons/src/main/java/com/chaos/sdk/v6/dto/ClusterState.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/octopus-commons/src/main/java/com/chaos/octopus/commons/util/Commands.java" afterPath="$PROJECT_DIR$/octopus-commons/src/main/java/com/chaos/octopus/commons/util/Commands.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/octopus-agent/src/main/java/com/chaos/octopus/agent/ExecutionHandler.java" afterPath="$PROJECT_DIR$/octopus-agent/src/main/java/com/chaos/octopus/agent/ExecutionHandler.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
</list>
<ignored path="parent-project.iws" />
......@@ -47,7 +41,7 @@
<entry file="file://$PROJECT_DIR$/octopus-server/src/main/java/com/chaos/octopus/server/synchronization/Heartbeat.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="24" column="13" selection-start-line="24" selection-start-column="13" selection-end-line="24" selection-end-column="13" />
<caret line="22" column="43" selection-start-line="22" selection-start-column="43" selection-end-line="22" selection-end-column="43" />
<folding>
<element signature="imports" expanded="true" />
</folding>
......@@ -55,11 +49,11 @@
</provider>
</entry>
</file>
<file leaf-file-name="ClusterState.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/octopus-commons/src/main/java/com/chaos/sdk/v6/dto/ClusterState.java">
<file leaf-file-name="Agent.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/octopus-agent/src/main/java/com/chaos/octopus/agent/Agent.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.1440501">
<caret line="9" column="0" selection-start-line="9" selection-start-column="0" selection-end-line="12" selection-end-column="20" />
<state vertical-scroll-proportion="0.5441893">
<caret line="114" column="0" selection-start-line="114" selection-start-column="0" selection-end-line="114" selection-end-column="0" />
<folding />
</state>
</provider>
......@@ -71,10 +65,12 @@
<state vertical-scroll-proportion="0.0">
<caret line="34" column="23" selection-start-line="34" selection-start-column="23" selection-end-line="34" selection-end-column="23" />
<folding>
<element signature="e#1411#1412#0" expanded="true" />
<element signature="e#1480#1481#0" expanded="true" />
<element signature="e#2428#2429#0" expanded="true" />
<element signature="e#2475#2476#0" expanded="true" />
<element signature="n#!!doc" expanded="false" />
<element signature="imports" expanded="false" />
<element signature="e#5053#5054#0" expanded="false" />
<element signature="e#5075#5076#0" expanded="false" />
<element signature="e#5758#5759#0" expanded="false" />
<element signature="e#5791#5792#0" expanded="false" />
</folding>
</state>
</provider>
......@@ -94,11 +90,11 @@
</split-first>
<split-second>
<leaf>
<file leaf-file-name="HeartbeatTest.java" pinned="false" current-in-tab="true">
<file leaf-file-name="HeartbeatTest.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/octopus-server/src/test/java/com/chaos/octopus/server/unit/Synchronization/HeartbeatTest.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.46416146">
<caret line="29" column="42" selection-start-line="29" selection-start-column="42" selection-end-line="29" selection-end-column="42" />
<state vertical-scroll-proportion="0.0">
<caret line="36" column="3" selection-start-line="36" selection-start-column="3" selection-end-line="36" selection-end-column="3" />
<folding>
<element signature="imports" expanded="true" />
</folding>
......@@ -106,6 +102,16 @@
</provider>
</entry>
</file>
<file leaf-file-name="AgentTest.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/octopus-agent/src/test/java/com/chaos/octopus/agent/unit/AgentTest.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.48782185">
<caret line="111" column="20" selection-start-line="111" selection-start-column="20" selection-end-line="111" selection-end-column="20" />
<folding />
</state>
</provider>
</entry>
</file>
</leaf>
</split-second>
</splitter>
......@@ -146,7 +152,11 @@
<option value="$PROJECT_DIR$/octopus-commons/src/main/java/com/chaos/octopus/commons/util/NetworkingUtil.java" />
<option value="$PROJECT_DIR$/octopus-server/src/main/java/com/chaos/octopus/server/AgentProxy.java" />
<option value="$PROJECT_DIR$/octopus-server/src/main/java/com/chaos/octopus/server/synchronization/Heartbeat.java" />
<option value="$PROJECT_DIR$/octopus-commons/src/main/java/com/chaos/octopus/commons/util/Commands.java" />
<option value="$PROJECT_DIR$/octopus-agent/src/main/java/com/chaos/octopus/agent/ExecutionHandler.java" />
<option value="$PROJECT_DIR$/octopus-commons/src/main/java/com/chaos/sdk/v6/dto/ClusterState.java" />
<option value="$PROJECT_DIR$/octopus-agent/src/main/java/com/chaos/octopus/agent/Agent.java" />
<option value="$PROJECT_DIR$/octopus-agent/src/test/java/com/chaos/octopus/agent/unit/AgentTest.java" />
</list>
</option>
</component>
......@@ -222,7 +232,7 @@
<sortByType />
</navigator>
<panes>
<pane id="PackagesPane" />
<pane id="Scratches" />
<pane id="ProjectPane">
<subPane>
<PATH>
......@@ -714,6 +724,18 @@
<option name="myItemId" value="src" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="test" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="java" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="unit" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
......@@ -747,8 +769,8 @@
</PATH>
</subPane>
</pane>
<pane id="PackagesPane" />
<pane id="Scope" />
<pane id="Scratches" />
</panes>
</component>
<component name="PropertiesComponent">
......@@ -760,13 +782,14 @@
<property name="restartRequiresConfirmation" value="true" />
<property name="OverrideImplement.combined" value="true" />
<property name="OverrideImplement.overriding.sorted" value="false" />
<property name="FullScreen" value="false" />
</component>
<component name="RecentsManager">
<key name="CreateClassDialog.RecentsKey">
<recent name="com.chaos.sdk" />
</key>
</component>
<component name="RunManager" selected="JUnit.HeartbeatTest.sdfsdf">
<component name="RunManager" selected="JUnit.AgentTest">
<configuration default="false" name="HeartbeatTest.sdfsdf" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
<pattern>
......@@ -845,6 +868,58 @@
<patterns />
<method />
</configuration>
<configuration default="false" name="AgentTest.getState_NoTasksQueued_ReturnEmptyState" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
<pattern>
<option name="PATTERN" value="com.chaos.octopus.agent.unit.*" />
<option name="ENABLED" value="true" />
</pattern>
</extension>
<module name="octopus-agent" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
<option name="PACKAGE_NAME" value="com.chaos.octopus.agent.unit" />
<option name="MAIN_CLASS_NAME" value="com.chaos.octopus.agent.unit.AgentTest" />
<option name="METHOD_NAME" value="getState_NoTasksQueued_ReturnEmptyState" />
<option name="TEST_OBJECT" value="method" />
<option name="VM_PARAMETERS" value="-ea" />
<option name="PARAMETERS" />
<option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
<option name="ENV_VARIABLES" />
<option name="PASS_PARENT_ENVS" value="true" />
<option name="TEST_SEARCH_SCOPE">
<value defaultName="singleModule" />
</option>
<envs />
<patterns />
<method />
</configuration>
<configuration default="false" name="AgentTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
<pattern>
<option name="PATTERN" value="com.chaos.octopus.agent.unit.*" />
<option name="ENABLED" value="true" />
</pattern>
</extension>
<module name="octopus-agent" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
<option name="PACKAGE_NAME" value="com.chaos.octopus.agent.unit" />
<option name="MAIN_CLASS_NAME" value="com.chaos.octopus.agent.unit.AgentTest" />
<option name="METHOD_NAME" />
<option name="TEST_OBJECT" value="class" />
<option name="VM_PARAMETERS" value="-ea" />
<option name="PARAMETERS" />
<option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
<option name="ENV_VARIABLES" />
<option name="PASS_PARENT_ENVS" value="true" />
<option name="TEST_SEARCH_SCOPE">
<value defaultName="singleModule" />
</option>
<envs />
<patterns />
<method />
</configuration>
<configuration default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
<module name="" />
<option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" />
......@@ -1035,21 +1110,28 @@
<patterns />
<method />
</configuration>
<list size="4">
<list size="6">
<item index="0" class="java.lang.String" itemvalue="JUnit.All Tests" />
<item index="1" class="java.lang.String" itemvalue="JUnit.HeartbeatTest.sdfsdf" />
<item index="2" class="java.lang.String" itemvalue="JUnit.HeartbeatTest" />
<item index="3" class="java.lang.String" itemvalue="JUnit.ChaosTest" />
<item index="4" class="java.lang.String" itemvalue="JUnit.AgentTest.getState_NoTasksQueued_ReturnEmptyState" />
<item index="5" class="java.lang.String" itemvalue="JUnit.AgentTest" />
</list>
<recent_temporary>
<list size="3">
<item index="0" class="java.lang.String" itemvalue="JUnit.HeartbeatTest.sdfsdf" />
<item index="1" class="java.lang.String" itemvalue="JUnit.ChaosTest" />
<item index="2" class="java.lang.String" itemvalue="JUnit.HeartbeatTest" />
<list size="5">
<item index="0" class="java.lang.String" itemvalue="JUnit.AgentTest" />
<item index="1" class="java.lang.String" itemvalue="JUnit.AgentTest.getState_NoTasksQueued_ReturnEmptyState" />
<item index="2" class="java.lang.String" itemvalue="JUnit.HeartbeatTest.sdfsdf" />
<item index="3" class="java.lang.String" itemvalue="JUnit.ChaosTest" />
<item index="4" class="java.lang.String" itemvalue="JUnit.HeartbeatTest" />
</list>
</recent_temporary>
</component>
<component name="ShelveChangesManager" show_recycled="false" />
<component name="SvnConfiguration">
<configuration />
</component>
<component name="TaskManager">
<task active="true" id="Default" summary="Default task">
<changelist id="057f0053-f4e8-40ac-9d01-6a2f351d655a" name="Default" comment="" />
......@@ -1071,11 +1153,10 @@
<window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.108072914" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2691162" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2691162" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.25" sideWeight="0.4974055" order="0" side_tool="false" content_ui="combo" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32969216" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
......@@ -1086,8 +1167,17 @@
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32969216" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
</layout>
</component>
<component name="Vcs.Log.UiProperties">
<option name="RECENTLY_FILTERED_USER_GROUPS">
<collection />
</option>
<option name="RECENTLY_FILTERED_BRANCH_GROUPS">
<collection />
</option>
</component>
<component name="VcsContentAnnotationSettings">
<option name="myLimit" value="2678400000" />
</component>
......@@ -1102,6 +1192,57 @@
<option name="FILTER_TARGETS" value="false" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/octopus-server/src/main/java/com/chaos/octopus/server/synchronization/Heartbeat.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="24" column="13" selection-start-line="24" selection-start-column="13" selection-end-line="24" selection-end-column="13" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/octopus-commons/src/main/java/com/chaos/sdk/v6/dto/ClusterState.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="9" column="0" selection-start-line="9" selection-start-column="0" selection-end-line="12" selection-end-column="20" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/octopus-server/src/main/java/com/chaos/octopus/server/OrchestratorImpl.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="34" column="23" selection-start-line="34" selection-start-column="23" selection-end-line="34" selection-end-column="23" />
<folding>
<element signature="n#!!doc" expanded="false" />
<element signature="imports" expanded="false" />
<element signature="e#5053#5054#0" expanded="false" />
<element signature="e#5075#5076#0" expanded="false" />
<element signature="e#5758#5759#0" expanded="false" />
<element signature="e#5791#5792#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/octopus-commons/src/main/java/com/chaos/sdk/AuthenticatedChaosClient.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="83" column="0" selection-start-line="83" selection-start-column="0" selection-end-line="83" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/octopus-server/src/test/java/com/chaos/octopus/server/unit/Synchronization/HeartbeatTest.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="13" column="28" selection-start-line="13" selection-start-column="28" selection-end-line="13" selection-end-column="28" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/octopus-agent/src/main/java/com/chaos/octopus/agent/Agent.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
......@@ -1132,7 +1273,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="11" column="20" selection-start-line="11" selection-start-column="20" selection-end-line="11" selection-end-column="20" />
<folding />
</state>
</provider>
</entry>
......@@ -1141,10 +1281,12 @@
<state vertical-scroll-proportion="0.0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding>
<element signature="e#1411#1412#0" expanded="true" />
<element signature="e#1480#1481#0" expanded="true" />
<element signature="e#2428#2429#0" expanded="true" />
<element signature="e#2475#2476#0" expanded="true" />
<element signature="n#!!doc" expanded="false" />
<element signature="imports" expanded="false" />
<element signature="e#5053#5054#0" expanded="false" />
<element signature="e#5075#5076#0" expanded="false" />
<element signature="e#5758#5759#0" expanded="false" />
<element signature="e#5791#5792#0" expanded="false" />
</folding>
</state>
</provider>
......@@ -1160,7 +1302,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.08751903">
<caret line="13" column="13" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
......@@ -1168,7 +1309,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.08751903">
<caret line="12" column="55" selection-start-line="12" selection-start-column="36" selection-end-line="12" selection-end-column="55" />
<folding />
</state>
</provider>
</entry>
......@@ -1183,7 +1323,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.19254185">
<caret line="21" column="55" selection-start-line="21" selection-start-column="50" selection-end-line="21" selection-end-column="55" />
<folding />
</state>
</provider>
</entry>
......@@ -1199,7 +1338,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.070068546">
<caret line="4" column="0" selection-start-line="4" selection-start-column="0" selection-end-line="4" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
......@@ -1221,7 +1359,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.035034273">
<caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
......@@ -1236,7 +1373,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.105102815">
<caret line="23" column="3" selection-start-line="23" selection-start-column="3" selection-end-line="23" selection-end-column="3" />
<folding />
</state>
</provider>
</entry>
......@@ -1244,7 +1380,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="19" column="13" selection-start-line="19" selection-start-column="13" selection-end-line="19" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
......@@ -1290,15 +1425,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.081354216">
<caret line="7" column="0" selection-start-line="7" selection-start-column="0" selection-end-line="7" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/octopus-agent/src/main/java/com/chaos/octopus/agent/Agent.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="22" column="13" selection-start-line="22" selection-start-column="13" selection-end-line="22" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
......@@ -1306,7 +1432,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.058110155">
<caret line="11" column="20" selection-start-line="11" selection-start-column="20" selection-end-line="11" selection-end-column="20" />
<folding />
</state>
</provider>
</entry>
......@@ -1322,7 +1447,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.13929313">
<caret line="17" column="3" selection-start-line="17" selection-start-column="3" selection-end-line="17" selection-end-column="3" />
<folding />
</state>
</provider>
</entry>
......@@ -1358,23 +1482,17 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/octopus-server/src/main/java/com/chaos/octopus/server/AllocationHandler.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.064022265">
<caret line="27" column="32" selection-start-line="27" selection-start-column="32" selection-end-line="27" selection-end-column="32" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/octopus-server/src/main/java/com/chaos/octopus/server/OrchestratorImpl.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="34" column="23" selection-start-line="34" selection-start-column="23" selection-end-line="34" selection-end-column="23" />
<folding>
<element signature="e#1411#1412#0" expanded="true" />
<element signature="e#1480#1481#0" expanded="true" />
<element signature="e#2428#2429#0" expanded="true" />
<element signature="e#2475#2476#0" expanded="true" />
<element signature="n#!!doc" expanded="false" />
<element signature="imports" expanded="false" />
<element signature="e#5053#5054#0" expanded="false" />
<element signature="e#5075#5076#0" expanded="false" />
<element signature="e#5758#5759#0" expanded="false" />
<element signature="e#5791#5792#0" expanded="false" />
</folding>
</state>
</provider>
......@@ -1394,49 +1512,87 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/octopus-commons/src/main/java/com/chaos/octopus/commons/util/Commands.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.081354216">
<caret line="10" column="35" selection-start-line="10" selection-start-column="35" selection-end-line="10" selection-end-column="35" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/octopus-server/src/main/java/com/chaos/octopus/server/AllocationHandler.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.3041058">
<caret line="27" column="32" selection-start-line="27" selection-start-column="32" selection-end-line="27" selection-end-column="32" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/octopus-server/src/main/java/com/chaos/octopus/server/AgentProxy.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.9039666">
<caret line="98" column="39" selection-start-line="98" selection-start-column="39" selection-end-line="98" selection-end-column="39" />
<state vertical-scroll-proportion="0.7439109">
<caret line="90" column="57" selection-start-line="90" selection-start-column="57" selection-end-line="90" selection-end-column="57" />
<folding>
<element signature="e#1163#1164#0" expanded="true" />
<element signature="e#1197#1198#0" expanded="true" />
<element signature="e#1867#1868#0" expanded="true" />
<element signature="e#1913#1914#0" expanded="true" />
<element signature="e#2949#2950#0" expanded="true" />
<element signature="e#2978#2979#0" expanded="true" />
<element signature="e#3019#3020#0" expanded="true" />
<element signature="e#3044#3045#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/octopus-server/src/main/java/com/chaos/octopus/server/synchronization/Heartbeat.java">
<entry file="file://$PROJECT_DIR$/octopus-server/src/test/java/com/chaos/octopus/server/unit/Synchronization/HeartbeatTest.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="24" column="13" selection-start-line="24" selection-start-column="13" selection-end-line="24" selection-end-column="13" />
<caret line="36" column="3" selection-start-line="36" selection-start-column="3" selection-end-line="36" selection-end-column="3" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/octopus-agent/src/main/java/com/chaos/octopus/agent/ExecutionHandler.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.6242171">
<caret line="47" column="0" selection-start-line="47" selection-start-column="0" selection-end-line="47" selection-end-column="0" />
<folding>
<element signature="e#1240#1241#0" expanded="true" />
<element signature="e#1268#1269#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/octopus-commons/src/main/java/com/chaos/sdk/v6/dto/ClusterState.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.1440501">
<caret line="9" column="0" selection-start-line="9" selection-start-column="0" selection-end-line="12" selection-end-column="20" />
<state vertical-scroll-proportion="0.25608906">
<caret line="16" column="26" selection-start-line="16" selection-start-column="26" selection-end-line="16" selection-end-column="26" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/octopus-server/src/test/java/com/chaos/octopus/server/unit/Synchronization/HeartbeatTest.java">
<entry file="file://$PROJECT_DIR$/octopus-server/src/main/java/com/chaos/octopus/server/synchronization/Heartbeat.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.46416146">
<caret line="29" column="42" selection-start-line="29" selection-start-column="42" selection-end-line="29" selection-end-column="42" />
<state vertical-scroll-proportion="0.0">
<caret line="22" column="43" selection-start-line="22" selection-start-column="43" selection-end-line="22" selection-end-column="43" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/octopus-agent/src/test/java/com/chaos/octopus/agent/unit/AgentTest.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.48782185">
<caret line="111" column="20" selection-start-line="111" selection-start-column="20" selection-end-line="111" selection-end-column="20" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/octopus-agent/src/main/java/com/chaos/octopus/agent/Agent.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.5441893">
<caret line="114" column="0" selection-start-line="114" selection-start-column="0" selection-end-line="114" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
octopus-java/octopus-agent/src/main/java/com/chaos/octopus/agent/Agent.java
+ 10
− 0
View file @ 1ceb5b2e
......@@ -9,6 +9,7 @@ import com.chaos.octopus.commons.exception.DisconnectError;
import com.chaos.octopus.commons.util.Commands;
import com.chaos.octopus.commons.util.NetworkingUtil;
import com.chaos.octopus.commons.util.StreamUtilities;
import com.chaos.sdk.v6.dto.ClusterState;
import java.io.IOException;
import java.io.OutputStream;
......@@ -103,6 +104,15 @@ public class Agent implements Runnable, AutoCloseable, TaskUpdatedListener {
}
}
public ClusterState.AgentState getState(){
ClusterState.AgentState state = new ClusterState.AgentState();
int executing = getQueueSize() > _executionHandler.getParallelism() ? _executionHandler.getParallelism() : getQueueSize();
state.runningSize = executing;
state.queueSize = getQueueSize();
return state;
}
private AgentConfigurationMessage createAgentConfigurationMessage() {
AgentConfigurationMessage message = new AgentConfigurationMessage();
......
octopus-java/octopus-agent/src/main/java/com/chaos/octopus/agent/ExecutionHandler.java
+ 1
− 0
View file @ 1ceb5b2e
......@@ -9,6 +9,7 @@ import com.chaos.octopus.commons.core.Plugin;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
public class ExecutionHandler implements AutoCloseable, TaskCompleteListener {
private Agent _agent;
......
octopus-java/octopus-agent/src/test/java/com/chaos/octopus/agent/unit/AgentTest.java
+ 128
− 106
View file @ 1ceb5b2e
......@@ -4,23 +4,18 @@ import static org.junit.Assert.*;
import java.util.List;
import com.chaos.octopus.commons.core.Task;
import com.chaos.octopus.commons.core.*;
import org.junit.Test;
import com.chaos.octopus.agent.Agent;
import com.chaos.octopus.commons.core.PluginDefinition;
import com.chaos.octopus.commons.core.TestPlugin;
public class AgentTest
{
public class AgentTest {
@Test
public void addPlugin_Default_PluginIsAddedToSupporedPlugins() throws Exception
{
public void addPlugin_Default_PluginIsAddedToSupporedPlugins() throws Exception {
PluginDefinition plugin = new TestPlugin();
ServerMock mock = new ServerMock();
try(Agent agent = new Agent(mock, 1))
{
try (Agent agent = new Agent(mock, 1)) {
agent.addPlugin(plugin);
List<PluginDefinition> plugins = agent.get_SupportedPlugins();
......@@ -30,13 +25,11 @@ public class AgentTest
}
@Test
public void serializeSupportedPlugins_AgentSupportASinglePlugin_ReturnByteArray() throws Exception
{
public void serializeSupportedPlugins_AgentSupportASinglePlugin_ReturnByteArray() throws Exception {
PluginDefinition plugin = new TestPlugin();
ServerMock mock = new ServerMock();
try(Agent agent = new Agent(mock, 1))
{
try (Agent agent = new Agent(mock, 1)) {
agent.addPlugin(plugin);
byte[] result = agent.serializeSupportedPlugins();
......@@ -46,12 +39,10 @@ public class AgentTest
}
@Test
public void enqueueTask_GivenATask_ShouldBeAddedToTheQueue() throws Exception
{
public void enqueueTask_GivenATask_ShouldBeAddedToTheQueue() throws Exception {
ServerMock mock = new ServerMock();
try(Agent agent = new Agent(mock, 1))
{
try (Agent agent = new Agent(mock, 1)) {
agent.addPlugin(new TestPlugin());
agent.enqueue(Make_TestTaskThatTake10msToExecute());
......@@ -61,12 +52,10 @@ public class AgentTest
}
@Test
public void executeTask_AgentIsStartedAndTaskQueued_TaskShouldBeExecuted() throws Exception
{
public void executeTask_AgentIsStartedAndTaskQueued_TaskShouldBeExecuted() throws Exception {
ServerMock mock = new ServerMock();
try(Agent agent = new Agent(mock, 1))
{
try (Agent agent = new Agent(mock, 1)) {
TestPlugin factory = new TestPlugin();
agent.addPlugin(factory);
......@@ -74,8 +63,7 @@ public class AgentTest
assertFalse(plugin.WasExecuted);
for(int i = 1000; i > 0 && !plugin.WasExecuted; i--)
{
for (int i = 1000; i > 0 && !plugin.WasExecuted; i--) {
Thread.sleep(1);
}
......@@ -84,12 +72,10 @@ public class AgentTest
}
@Test
public void onTaskComplete_APluginIsExecuted_ShouldNotifyServer() throws Exception
{
public void onTaskComplete_APluginIsExecuted_ShouldNotifyServer() throws Exception {
ServerMock mock = new ServerMock();
try(Agent agent = new Agent(mock, 1))
{
try (Agent agent = new Agent(mock, 1)) {
TestPlugin factory = new TestPlugin();
agent.addPlugin(factory);
......@@ -98,16 +84,52 @@ public class AgentTest
assertFalse(plugin.WasExecuted);
for (int i = 1000; i > 0 && !mock.WasOnCompleteCalled; i--)
{
Thread.sleep(1);
}
assertTrue(mock.WasOnCompleteCalled);
}
}
protected Task Make_TestTaskThatTake10msToExecute()
{
@Test
public void getState_NoTasksQueued_ReturnEmptyState() throws Exception {
ServerMock mock = new ServerMock();
try(Agent a = new Agent(mock, 1)){
assertEquals(0, a.getState().runningSize);
}
}
@Test
public void getState_OneTask_ReturnOneExecutingTask() throws Exception {
ServerMock mock = new ServerMock();
try(Agent a = new Agent(mock, 1)){
a.addPlugin(new TestPlugin());
Plugin p = a.enqueue(Make_TestTaskThatTake10msToExecute());
for (int i = 1000; i > 0 && p.getTask().get_State() != TaskState.Executing; i--)
Thread.sleep(1);
assertEquals(1, a.getState().runningSize);
assertEquals(1, a.getState().queueSize);
}
}
@Test
public void getState_OneExecutingAndOneQueuedTask_ReturnOneExecutingTask() throws Exception {
ServerMock mock = new ServerMock();
try(Agent a = new Agent(mock, 1)){
a.addPlugin(new TestPlugin());
Plugin p = a.enqueue(Make_TestTaskThatTake10msToExecute());
a.enqueue(Make_TestTaskThatTake10msToExecute());
for (int i = 1000; i > 0 && p.getTask().get_State() != TaskState.Executing; i--)
Thread.sleep(1);
assertEquals(1, a.getState().runningSize);
assertEquals(2, a.getState().queueSize);
}
}
protected Task Make_TestTaskThatTake10msToExecute() {
Task task = new Task();
task.pluginId = "com.chaos.octopus.agent.unit.TestPlugin, 1.0.0";
task.properties.put("sleep", "10");
......
octopus-java/octopus-commons/src/main/java/com/chaos/octopus/commons/util/Commands.java
+ 1
− 0
View file @ 1ceb5b2e
......@@ -10,4 +10,5 @@ public class Commands {
public static final String ENQUEUE_TASK = "enqueue-task";
public static final String TASK_DONE = "task-done";
public static final String TASK_UPDATE = "task-update";
public static final String AGENT_STATE = "agent-state";
}
octopus-java/octopus-commons/src/main/java/com/chaos/sdk/v6/dto/ClusterState.java
+ 4
− 0
View file @ 1ceb5b2e
......@@ -11,5 +11,9 @@ public class ClusterState {
public boolean hasAvailableSlots;
public String hostname;
public int port;
public int cpuUsage;
public int ramUsage;
public int queueSize;
public int runningSize;
}
}
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment