fix: upgrade_test on local

Author: fraidev

crates/fluvio-spu/src/core/metrics.rs

@@ -42,8 +42,8 @@ pub(crate) struct Record {
 
 impl Record {
     pub(crate) fn increase(&self, records: u64, bytes: u64) {
-        self.records.fetch_add(records, Ordering::SeqCst);
-        self.bytes.fetch_add(bytes, Ordering::SeqCst);
+        self.records.fetch_add(records, Ordering::Relaxed);
+        self.bytes.fetch_add(bytes, Ordering::Relaxed);
     }
 }
 

crates/fluvio/src/metrics/mod.rs

@@ -65,14 +65,12 @@ cfg_if::cfg_if! {
         }
 
         impl RecordCounter {
-            #[inline]
             pub(crate) fn add_records(&self, value: u64) {
-                self.records.fetch_add(value, Ordering::SeqCst);
+                self.records.fetch_add(value, Ordering::Relaxed);
             }
 
-            #[inline]
             pub(crate) fn add_bytes(&self, value: u64) {
-                self.bytes.fetch_add(value, Ordering::SeqCst);
+                self.bytes.fetch_add(value, Ordering::Relaxed);
             }
         }
 

makefiles/build.mk

@@ -48,6 +48,8 @@ ifeq (${CI},true)
 build_k8_image:
 else ifeq (${IMAGE_VERSION},true)
 build_k8_image:
+else ifeq (${FLUVIO_MODE},local)
+build_k8_image:
 else
 # When not in CI (i.e. development), build image before testing
 build_k8_image: fluvio_image

tests/upgrade-test.sh

@@ -52,7 +52,11 @@ function cleanup() {
 # If we're in CI, we want to slow down execution
 # to give CPU some time to rest, so we don't time out
 function ci_check() {
-    :
+    if [[ "$FLUVIO_MODE" == "local" ]]; then
+        sleep $CI_SLEEP
+    else
+        :
+    fi
 }
 
 # This function is intended to be run second after the Stable-1 validation
@@ -104,6 +108,7 @@ function validate_cluster_stable() {
     # https://github.com/infinyon/fluvio/issues/1819
     echo "Validate consume on \"${STABLE_TOPIC}\" before producing"
     $STABLE_FLUVIO consume -B -d ${STABLE_TOPIC} 2>/dev/null
+    ci_check;
 
     echo "Producing test data to ${STABLE_TOPIC}"
     cat data1.txt.tmp | $STABLE_FLUVIO produce ${STABLE_TOPIC}
@@ -128,6 +133,7 @@ function validate_cluster_stable() {
 
 
     $STABLE_FLUVIO partition list
+    ci_check;
 
 }
 
@@ -151,7 +157,7 @@ function validate_upgrade_cluster_to_prerelease() {
         ~/.fvm/bin/fvm install latest | tee /tmp/installer.output 
         # expectd output fvm current => 0.11.0-dev-1+hash (latest)
         DEV_VERSION=$(~/.fvm/bin/fvm current | awk '{print $1}')
-        TARGET_VERSION=${PRERELEASE:0:${#PRERELEASE}-41}
+        TARGET_VERSION=${DEV_VERSION:0:${#DEV_VERSION}-41}
 
         echo "Installed CLI version ${DEV_VERSION}"
         echo "Upgrading cluster to ${DEV_VERSION}"
@@ -172,17 +178,18 @@ function validate_upgrade_cluster_to_prerelease() {
     fi
     if [[ "$FLUVIO_MODE" == "local" ]]; then
 	echo "Resuming local cluster"
-	sleep 5
 	$FLUVIO_BIN_ABS_PATH cluster resume
     fi
     popd
 
+    ci_check;
 
     # Validate that the development version output matches the expected version from installer output
     $FLUVIO_BIN_ABS_PATH version
     validate_cli_version $FLUVIO_BIN_ABS_PATH $TARGET_VERSION
     validate_platform_version $FLUVIO_BIN_ABS_PATH $TARGET_VERSION
 
+    ci_check;
 
     echo "Create test topic: ${PRERELEASE_TOPIC}"
     $FLUVIO_BIN_ABS_PATH topic create ${PRERELEASE_TOPIC}
@@ -324,6 +331,8 @@ function main() {
     echo "Update cluster to stable v${STABLE}. Create and validate data."
     validate_cluster_stable;
 
+    ci_check;
+
     echo "Update cluster to prerelease v${PRERELEASE}"
     validate_upgrade_cluster_to_prerelease;