Merge branch 'release-1.125.1'

CHANGELOG.md

@@ -1,6 +1,22 @@
 # Changelog
 
-## v1.125.0 (19/10/2022)
+## v1.125.1 (27/10/2022)
+
+### Bug Fixes:
+-  [#4953](https://github.com/telstra/open-kilda/pull/4953) Added tuple grouping into Connected Devices Topology (Issue: [#4952](https://github.com/telstra/open-kilda/issues/4952))
+-  [#4957](https://github.com/telstra/open-kilda/pull/4957) Fixed max_latency unit for Y-flows (Issue: [#4956](https://github.com/telstra/open-kilda/issues/4956)) [**northbound**]
+
+### Improvements:
+-  [#4968](https://github.com/telstra/open-kilda/pull/4968) Added parallelism options into flow hs for not loaded bolts
+
+For the complete list of changes, check out [the commit log](https://github.com/telstra/open-kilda/compare/v1.125.0...v1.125.1).
+
+### Affected Components:
+flow-hs, nb, connected
+
+---
+
+## v1.125.0 (20/10/2022)
 
 ### Features:
 -  [#4958](https://github.com/telstra/open-kilda/pull/4958) Added LACP replies for LAG ports [**floodlight**][**northbound**][**storm-topologies**]

confd/templates/flowhs-topology/flowhs-topology.tmpl

@@ -38,3 +38,33 @@ bolts:
     # That is why we need to increase parallelism of speaker worker at least to flow reroute parallelism
   - id: "SPEAKER_WORKER"
     parallelism: {{ mul (atoi (getv "/kilda_storm_flow_hs_parallelism")) (atoi (getv "/kilda_storm_flow_hs_reroute_hub_count_multiplier")) }}
+  - id: "FLOW_CREATE_HUB"
+    parallelism: {{ getv "/kilda_storm_flow_hs_flow_create_hub_parallelism" }}
+  - id: "FLOW_DELETE_HUB"
+    parallelism: {{ getv "/kilda_storm_flow_hs_flow_delete_hub_parallelism" }}
+  - id: "FLOW_SWAP_ENDPOINTS_HUB"
+    parallelism: {{ getv "/kilda_storm_flow_hs_flow_swap_endpoint_hub_parallelism" }}
+  - id: "FLOW_CREATE_MIRROR_POINT_HUB"
+    parallelism: {{ getv "/kilda_storm_flow_hs_flow_create_mirror_hub_parallelism" }}
+  - id: "FLOW_DELETE_MIRROR_POINT_HUB"
+    parallelism: {{ getv "/kilda_storm_flow_hs_flow_delete_mirror_hub_parallelism" }}
+  - id: "YFLOW_CREATE_HUB"
+    parallelism: {{ getv "/kilda_storm_flow_hs_y_flow_create_hub_parallelism" }}
+  - id: "YFLOW_DELETE_HUB"
+    parallelism: {{ getv "/kilda_storm_flow_hs_y_flow_delete_hub_parallelism" }}
+  - id: "YFLOW_READ_BOLT"
+    parallelism: {{ getv "/kilda_storm_flow_hs_y_flow_read_hub_parallelism" }}
+  - id: "HISTORY_BOLT"
+    parallelism: {{ getv "/kilda_storm_flow_hs_history_bolt_parallelism" }}
+  - id: "METRICS_BOLT"
+    parallelism: {{ getv "/kilda_storm_flow_hs_metrics_bolt_parallelism" }}
+  - id: "NB_RESPONSE_SENDER"
+    parallelism: {{ getv "/kilda_storm_flow_hs_nb_response_sender_parallelism" }}
+  - id: "REROUTE_RESPONSE_SENDER"
+    parallelism: {{ getv "/kilda_storm_flow_hs_reroute_response_sender_parallelism" }}
+  - id: "SERVER42_CONTROL_TOPOLOGY_SENDER"
+    parallelism: {{ getv "/kilda_storm_flow_hs_server42_control_sender_parallelism" }}
+  - id: "SPEAKER_DUMP_REQUEST_SENDER"
+    parallelism: {{ getv "/kilda_storm_flow_hs_dump_request_sender_parallelism" }}
+  - id: "STATS_TOPOLOGY_SENDER"
+    parallelism: {{ getv "/kilda_storm_flow_hs_stats_sender_parallelism" }}

confd/vars/main.yaml

@@ -171,13 +171,32 @@ kilda_storm_swmanager_heavy_operation_parallelism: 2
 kilda_storm_isl_latency_parallelism: 4
 kilda_storm_parallelism_level_new: 2
 kilda_storm_parallelism_level: 1
-kilda_storm_flow_hs_parallelism: 2
-kilda_storm_flow_hs_reroute_hub_count_multiplier: 2
-kilda_storm_flowhs_workers: 1
 kilda_storm_parallelism_workers_count: 1
 kilda_storm_history_parallelism: 2
 kilda_storm_stats_parallelism: 2
 
+# Flow HS
+kilda_storm_flow_hs_parallelism: 2
+kilda_storm_flow_hs_reroute_hub_count_multiplier: 2
+kilda_storm_flowhs_workers: 1
+kilda_storm_flow_hs_flow_create_hub_parallelism: 2
+kilda_storm_flow_hs_flow_delete_hub_parallelism: 2
+kilda_storm_flow_hs_flow_swap_endpoint_hub_parallelism: 2
+kilda_storm_flow_hs_flow_create_mirror_hub_parallelism: 2
+kilda_storm_flow_hs_flow_delete_mirror_hub_parallelism: 2
+kilda_storm_flow_hs_y_flow_create_hub_parallelism: 2
+kilda_storm_flow_hs_y_flow_delete_hub_parallelism: 2
+kilda_storm_flow_hs_y_flow_read_hub_parallelism: 2
+
+# Flow HS kafka bolts
+kilda_storm_flow_hs_history_bolt_parallelism: 2
+kilda_storm_flow_hs_metrics_bolt_parallelism: 2
+kilda_storm_flow_hs_nb_response_sender_parallelism: 2
+kilda_storm_flow_hs_reroute_response_sender_parallelism: 2
+kilda_storm_flow_hs_server42_control_sender_parallelism: 2
+kilda_storm_flow_hs_dump_request_sender_parallelism: 2
+kilda_storm_flow_hs_stats_sender_parallelism: 2
+
 kilda_storm_spout_parallelism: 2
 
 kilda_storm_flow_monitoring_parallelism: 2

src-java/connecteddevices-topology/connecteddevices-storm-topology/src/main/java/org/openkilda/wfm/topology/connecteddevices/ConnectedDevicesTopology.java

@@ -22,9 +22,11 @@
 import org.openkilda.wfm.share.zk.ZooKeeperSpout;
 import org.openkilda.wfm.topology.AbstractTopology;
 import org.openkilda.wfm.topology.connecteddevices.bolts.PacketBolt;
+import org.openkilda.wfm.topology.utils.KafkaRecordTranslator;
 
 import org.apache.storm.generated.StormTopology;
 import org.apache.storm.topology.TopologyBuilder;
+import org.apache.storm.tuple.Fields;
 
 public class ConnectedDevicesTopology extends AbstractTopology<ConnectedDevicesTopologyConfig> {
     public static final String CONNECTED_DEVICES_SPOUT_ID = "connected-devices-spout";
@@ -60,7 +62,7 @@ private void createZkSpout(TopologyBuilder builder) {
     private void createPacketBolt(TopologyBuilder builder, PersistenceManager persistenceManager) {
         PacketBolt routerBolt = new PacketBolt(persistenceManager, ZooKeeperSpout.SPOUT_ID);
         declareBolt(builder, routerBolt, PACKET_BOLT_ID)
-                .shuffleGrouping(CONNECTED_DEVICES_SPOUT_ID)
+                .fieldsGrouping(CONNECTED_DEVICES_SPOUT_ID, new Fields(KafkaRecordTranslator.FIELD_ID_KEY))
                 .allGrouping(ZooKeeperSpout.SPOUT_ID);
     }
 

src-java/northbound-service/northbound/src/main/java/org/openkilda/northbound/converter/YFlowMapper.java

@@ -78,6 +78,8 @@ public abstract class YFlowMapper {
     @Mapping(target = "yFlowId", source = "YFlowId")
     @Mapping(target = "yPoint", source = "YPoint")
     @Mapping(target = "protectedPathYPoint", source = "protectedPathYPoint")
+    @Mapping(target = "maxLatency", qualifiedByName = "timeNanosToMillis")
+    @Mapping(target = "maxLatencyTier2", qualifiedByName = "timeNanosToMillis")
     public abstract YFlow toYFlow(YFlowDto flow);
 
     public abstract SubFlow toYFlow(SubFlowDto flow);
@@ -164,11 +166,17 @@ private List<GroupFlowPathPayload> toGroupPaths(List<FlowPathDto> paths, Predica
 
     @Mapping(target = "type", constant = "CREATE")
     @Mapping(target = "yFlowId", source = "YFlowId")
+    @Mapping(target = "maxLatency", qualifiedByName = "timeMillisToNanos")
+    @Mapping(target = "maxLatencyTier2", qualifiedByName = "timeMillisToNanos")
     public abstract YFlowRequest toYFlowCreateRequest(YFlowCreatePayload source);
 
     @Mapping(target = "type", constant = "UPDATE")
+    @Mapping(target = "maxLatency", qualifiedByName = "timeMillisToNanos")
+    @Mapping(target = "maxLatencyTier2", qualifiedByName = "timeMillisToNanos")
     public abstract YFlowRequest toYFlowUpdateRequest(String yFlowId, YFlowUpdatePayload source);
 
+    @Mapping(target = "maxLatency", qualifiedByName = "timeMillisToNanos")
+    @Mapping(target = "maxLatencyTier2", qualifiedByName = "timeMillisToNanos")
     public abstract YFlowPartialUpdateRequest toYFlowPatchRequest(String yFlowId, YFlowPatchPayload source);
 
     @Mapping(target = "status", ignore = true)