Merge branch 'master' into implement_android_checkin_delegate

project-chip · Mar 14, 2024 · f56f843 · f56f843
2 parents 9dc42b3 + 84970a0
commit f56f843
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 38 deletions.
diff --git a/.github/actions/checkout-submodules-and-bootstrap/action.yaml b/.github/actions/checkout-submodules-and-bootstrap/action.yaml
@@ -41,3 +41,10 @@ runs:
       uses: ./.github/actions/upload-bootstrap-logs
       with:
         bootstrap-log-name: ${{ inputs.bootstrap-log-name }}
+    - name: Work around TSAN ASLR issues
+      if: runner.os == 'Linux' && !env.ACT
+      shell: bash
+      run: |
+        # See https://stackoverflow.com/a/77856955/2365113
+        if [[ "$UID" == 0 ]]; then function sudo() { "$@"; }; fi
+        sudo sysctl vm.mmap_rnd_bits=28
diff --git a/.github/actions/maximize-runner-disk/action.yaml b/.github/actions/maximize-runner-disk/action.yaml
@@ -4,47 +4,45 @@ runs:
   using: "composite"
   steps:
     - name: Free up disk space on the github runner
-      if: ${{ !env.ACT }}
+      if: runner.os == 'Linux' && !env.ACT
       shell: bash
       run: |
         # maximize-runner-disk
-        if [[ "$RUNNER_OS" == Linux ]]; then
-          # Directories to prune to free up space. Candidates:
-          #   1.6G  /usr/share/dotnet
-          #   1.1G  /usr/local/lib/android/sdk/platforms
-          #   1000M /usr/local/lib/android/sdk/build-tools
-          #   8.9G  /usr/local/lib/android/sdk
-          # This list can be amended later to change the trade-off between the amount of
-          # disk space freed up, and how long it takes to do so (deleting many files is slow).
-          prune=(/usr/share/dotnet /usr/local/lib/android/sdk/platforms /usr/local/lib/android/sdk/build-tools)
+        # Directories to prune to free up space. Candidates:
+        #   1.6G  /usr/share/dotnet
+        #   1.1G  /usr/local/lib/android/sdk/platforms
+        #   1000M /usr/local/lib/android/sdk/build-tools
+        #   8.9G  /usr/local/lib/android/sdk
+        # This list can be amended later to change the trade-off between the amount of
+        # disk space freed up, and how long it takes to do so (deleting many files is slow).
+        prune=(/usr/share/dotnet /usr/local/lib/android/sdk/platforms /usr/local/lib/android/sdk/build-tools)
 
-          if [[ "$UID" -eq 0 && -d /__w ]]; then
-            root=/runner-root-volume
-            if [[ ! -d "$root" ]]; then
-              echo "Unable to maximize disk space, job is running inside a container and $root is not mounted"
-              exit 0
-            fi
-            function sudo() { "$@"; } # we're already root (and sudo is probably unavailable)
-          elif [[ "$UID" -ne 0 && "$RUNNER_ENVIRONMENT" == github-hosted ]]; then
-            root=
-          else
-            echo "Unable to maximize disk space, unknown runner environment"
+        if [[ "$UID" -eq 0 && -d /__w ]]; then
+          root=/runner-root-volume
+          if [[ ! -d "$root" ]]; then
+            echo "Unable to maximize disk space, job is running inside a container and $root is not mounted"
             exit 0
           fi
-
-          echo "Freeing up runner disk space on ${root:-/}"
-          function avail() { df -k --output=avail "${root:-/}" | grep '^[0-9]*$'; }
-          function now() { date '+%s'; }
-          before="$(avail)" start="$(now)"
-          for dir in "${prune[@]}"; do
-            if [[ -d "${root}${dir}" ]]; then
-              echo "- $dir"
-              # du -sh -- "${root}${dir}"
-              sudo rm -rf -- "${root}${dir}"
-            else
-              echo "- $dir (not found)"
-            fi
-          done
-          after="$(avail)" end="$(now)"
-          echo "Done, freed up $(( (after - before) / 1024 ))M of disk space in $(( end - start )) seconds."
+          function sudo() { "$@"; } # we're already root (and sudo is probably unavailable)
+        elif [[ "$UID" -ne 0 && "$RUNNER_ENVIRONMENT" == github-hosted ]]; then
+          root=
+        else
+          echo "Unable to maximize disk space, unknown runner environment"
+          exit 0
         fi
+
+        echo "Freeing up runner disk space on ${root:-/}"
+        function avail() { df -k --output=avail "${root:-/}" | grep '^[0-9]*$'; }
+        function now() { date '+%s'; }
+        before="$(avail)" start="$(now)"
+        for dir in "${prune[@]}"; do
+          if [[ -d "${root}${dir}" ]]; then
+            echo "- $dir"
+            # du -sh -- "${root}${dir}"
+            sudo rm -rf -- "${root}${dir}"
+          else
+            echo "- $dir (not found)"
+          fi
+        done
+        after="$(avail)" end="$(now)"
+        echo "Done, freed up $(( (after - before) / 1024 ))M of disk space in $(( end - start )) seconds."
diff --git a/src/controller/AbstractDnssdDiscoveryController.cpp b/src/controller/AbstractDnssdDiscoveryController.cpp
@@ -34,9 +34,11 @@ void AbstractDnssdDiscoveryController::OnNodeDiscovered(const chip::Dnssd::Disco
         {
             continue;
         }
+        // TODO(#32576) Check if IP address are the same. Must account for `numIPs` in the list of `ipAddress`.
+        // Additionally, must NOT assume that the ordering is consistent.
         if (strcmp(discoveredNode.resolutionData.hostName, nodeData.resolutionData.hostName) == 0 &&
             discoveredNode.resolutionData.port == nodeData.resolutionData.port &&
-            discoveredNode.resolutionData.ipAddress == nodeData.resolutionData.ipAddress)
+            discoveredNode.resolutionData.numIPs == nodeData.resolutionData.numIPs)
         {
             discoveredNode = nodeData;
             if (mDeviceDiscoveryDelegate != nullptr)