Skip to content

Conversation

n2h9
Copy link
Contributor

@n2h9 n2h9 commented Aug 13, 2025

…ister-logic-on-duplicate-k8sconfig"

This reverts commit 9412578, reversing changes made to dd6ec7d.

Notes for Reviewers

because pr #15568 fails integration test.

here logs from set up step
Collecting meshsync events...
Printing server logs...
time="2025-08-13T17:51:29Z" level=info msg="Local Provider capabilities are: " app=meshery
time="2025-08-13T17:51:29Z" level=info msg="Meshery Server release channel is: edge" app=meshery
time="2025-08-13T17:51:29Z" level=info msg="MESHSYNC_DEFAULT_DEPLOYMENT_MODE is " app=meshery
time="2025-08-13T17:51:29Z" level=info msg="Meshery Database is at: /home/appuser/.meshery/config" app=meshery
time="2025-08-13T17:51:29Z" level=info msg="Using kubeconfig at: /home/appuser/.kube" app=meshery
time="2025-08-13T17:51:29Z" level=info msg="Log level: info" app=meshery
time="2025-08-13T17:51:29Z" level=info msg="creating directories for seeding... /home/appuser/.meshery/content/filters/binaries" app=meshery
time="2025-08-13T17:51:30Z" level=info msg="seeding sample Patterns" app=meshery
time="2025-08-13T17:51:32Z" level=info msg="Meshery Server listening on: 8080" app=meshery
time="2025-08-13T17:51:33Z" level=info msg="extracting Filters from /home/appuser/.meshery/content/filters/binaries" app=meshery
time="2025-08-13T17:51:33Z" level=info msg="seeding sample Filters" app=meshery
time="2025-08-13T17:51:54Z" level=warning app=meshery code=meshery-server-1333 probable-cause="The session might not exist or could have been deleted." severity=2 short-description="unable to find session for user with id: meshery." suggested-remediation="Check if the session data was correctly saved."
time="2025-08-13T17:51:54Z" level=info msg="Generated context: kind-meshery-integration-test-meshsync-cluster\n" app=meshery
time="2025-08-13T17:51:54Z" level=info msg="initialising K8s machine for connetion Id60bb7468-55b7-5606-a5fa-9b629d[89](https://github.com/meshery/meshery/actions/runs/16944897237/job/48023275212?pr=15576#step:12:90)f544" app=meshery
time="2025-08-13T17:51:55Z" level=info msg="For registrant artifacthub imported 3 models, 13 components." app=meshery
time="2025-08-13T17:51:55Z" level=info msg="For registrant artifacthub imported 143 models, 1199 components, 3 relationships." app=meshery
time="2025-08-13T17:51:55Z" level=info msg="For registrant github imported 122 models, 1198 components, 200 relationships." app=meshery
time="2025-08-13T17:51:55Z" level=info msg="For registrant github imported 2 models, 146 components, 13 relationships." app=meshery
time="2025-08-13T17:51:55Z" level=info msg="For registrant meshery imported 9 models, 1158 components, 3 relationships." app=meshery
time="2025-08-13T17:51:55Z" level=error msg="error in saving k8s context connection already exists: kubernetes context already persisted with provider" app=meshery code= probable-cause= severity=0 short-description= suggested-remediation=
time="2025-08-13T17:51:58Z" level=warning app=meshery code=meshery-server-1333 probable-cause="The session might not exist or could have been deleted." severity=2 short-description="unable to find session for user with id: meshery." suggested-remediation="Check if the session data was correctly saved."
time="2025-08-13T17:51:58Z" level=info msg="Generated context: kind-meshery-integration-test-meshsync-cluster\n" app=meshery
time="2025-08-13T17:52:02Z" level=warning app=meshery code=meshery-server-1333 probable-cause="The session might not exist or could have been deleted." severity=2 short-description="unable to find session for user with id: meshery." suggested-remediation="Check if the session data was correctly saved."
time="2025-08-13T17:52:02Z" level=info msg="Generated context: kind-meshery-integration-test-meshsync-cluster\n" app=meshery
time="2025-08-13T17:52:06Z" level=warning app=meshery code=meshery-server-1333 probable-cause="The session might not exist or could have been deleted." severity=2 short-description="unable to find session for user with id: meshery." suggested-remediation="Check if the session data was correctly saved."
time="2025-08-13T17:52:06Z" level=info msg="Generated context: kind-meshery-integration-test-meshsync-cluster\n" app=meshery

revert first, figure out later ✅

Signed commits

  • Yes, I signed my commits.

…on-persister-logic-on-duplicate-k8sconfig"

This reverts commit 9412578, reversing
changes made to dd6ec7d.

Signed-off-by: Nikita B <n2h9z4@gmail.com>
Copy link
Contributor

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Summary of Changes

Hello @n2h9, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request performs a full revert of PR #15568, which aimed to modify connection persistence logic for duplicate Kubernetes configurations. The revert is necessary because the original changes introduced integration test failures, specifically related to an "already exists" error when saving Kubernetes contexts. By reverting, the PR restores the previous, stable behavior of the connection persistence mechanism.

Highlights

  • Revert of Prior Changes: Fully reverts the changes introduced in pull request #15568, which had caused integration test failures.
  • Error Handling Simplification: Removes the custom ErrConnectionAlreadyExist error and its associated logic, including its definition and specific handling in connection persistence.
  • Restored Connection Logic: Reinstates the original behavior for saving Kubernetes contexts, no longer attempting to wrap or specifically handle existing connection errors.
Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point in your pull request via creating an issue comment (i.e. comment on the pull request page) using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands.

Feature Command Description
Code Review /gemini review Performs a code review for the current pull request in its current state.
Pull Request Summary /gemini summary Provides a summary of the current pull request in its current state.
Comment @gemini-code-assist Responds in comments when explicitly tagged, both in issue comments and review comments.
Help /gemini help Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.

Footnotes

  1. Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution.

Copy link
Contributor

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Review

This pull request reverts a previous change that was causing integration tests to fail. The revert itself is correct and removes the problematic logic. However, the code being restored has a flaw: it silently ignores updates to existing connections, which could lead to data inconsistencies. I've provided a review comment with a suggested fix to properly handle updates for existing connections. This should address the underlying issue the original PR was trying to solve, while also keeping the tests passing.

Comment on lines 87 to 89
if err := tx.First(&existingConnection, "id = ?", connection.ID).Error; err == nil {
return ErrConnectionAlreadyExist
return err
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

high

While this revert fixes the integration test failure, the restored logic has a potential issue. If a connection with the same ID already exists, this function returns successfully without updating the record in the database. This means any changes to the connection's properties (like its metadata) will be silently ignored, leading to stale data.

To ensure data consistency, the function should update the existing record instead of just returning. This would also likely address the underlying issue that the original (now reverted) PR was trying to solve.

I suggest modifying the logic to perform an update when a connection is found.

        if err := tx.First(&existingConnection, "id = ?", connection.ID).Error; err == nil {
			// The connection already exists, so we update it.
			// Preserve the creation timestamp to avoid it being overwritten.
			connection.CreatedAt = existingConnection.CreatedAt
			return tx.Save(connection).Error
		} else if !errors.Is(err, gorm.ErrRecordNotFound) {
			// An actual error occurred during the lookup.
			return err
		}

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you gemi 🙇‍♀️

I am reverting to previous state and then think how to handle this case properly ✅

Copy link

@n2h9 n2h9 temporarily deployed to staging-playground August 13, 2025 18:26 — with GitHub Actions Inactive
Copy link

Commit SHA: 6508fec02a00feb1be61ed44376ef923d2af8f6c

END-TO-END TESTS

  • Testing started at: August 13th 2025, 6:33:43 pm

📦 Test Result Summary

  • ✅ 72 passed
  • ❌ 0 failed
  • ⚠️ 1 flaked
  • ⏩ 0 skipped

Duration: 6 minutes and 4 seconds

Overall Result: 👍 All tests passed.

[Show/Hide] Test Result Details
Test Browser Test Case Tags Result
1 chromium-local-provider Transition to ignored state and then back to connected state ⚠️

@n2h9 n2h9 merged commit 8e4fc36 into meshery:master Aug 13, 2025
15 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant