[IM] Fix potential CI crash and random CI failure (project-chip#17158)

* [IM] Fix CI crash and random CI failure * lift ci timeout * Fix
mspang · Apr 8, 2022 · 2358a9a · 2358a9a
1 parent 3621b3b
commit 2358a9a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/.github/workflows/cirque.yaml b/.github/workflows/cirque.yaml
@@ -26,7 +26,7 @@ concurrency:
 jobs:
     cirque:
         name: Cirque
-        timeout-minutes: 60
+        timeout-minutes: 75
 
         env:
             DOCKER_RUN_VERSION: 0.5.56

diff --git a/src/app/InteractionModelEngine.h b/src/app/InteractionModelEngine.h
@@ -244,6 +244,7 @@ class InteractionModelEngine : public Messaging::ExchangeDelegate,
             readClient->mpImEngine = nullptr;
             auto * tmpClient       = readClient->GetNextClient();
             readClient->SetNextClient(nullptr);
+            readClient->Close(CHIP_NO_ERROR);
             readClient = tmpClient;
         }
 

diff --git a/src/controller/TypedReadCallback.h b/src/controller/TypedReadCallback.h
@@ -112,8 +112,10 @@ class TypedReadAttributeCallback final : public app::ReadClient::Callback
                     aReadPrepareParams.mpAttributePathParamsList != nullptr);
         chip::Platform::Delete<app::AttributePathParams>(aReadPrepareParams.mpAttributePathParamsList);
 
-        VerifyOrDie(aReadPrepareParams.mDataVersionFilterListSize == 1 && aReadPrepareParams.mpDataVersionFilterList != nullptr);
-        chip::Platform::Delete<app::DataVersionFilter>(aReadPrepareParams.mpDataVersionFilterList);
+        if (aReadPrepareParams.mDataVersionFilterListSize == 1 && aReadPrepareParams.mpDataVersionFilterList != nullptr)
+        {
+            chip::Platform::Delete<app::DataVersionFilter>(aReadPrepareParams.mpDataVersionFilterList);
+        }
     }
 
     ClusterId mClusterId;