Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge Main into Azure Storage v12 Branch #911

Merged
merged 8 commits into from
May 31, 2023

Conversation

wsugarman
Copy link
Contributor

Merge main branch and resolve conflicts, specifically arising from #891

shankarsama and others added 8 commits April 24, 2023 14:52
…ons (Azure#892)

* [AzureServiceFabric] Handle missing ExecutionStartedEvent orchestrations

---------

Co-authored-by: Shankar Reddy Sama <shsama@microsoft.com>
…zure#896)

Co-authored-by: Shankar Reddy Sama <shsama@microsoft.com>
…zure#898)

* Bumping up DurableTask.AzureServicefabric package version to 2.3.8

* [AzureServiceFabric] Fix issues related to Terminate orchestration

* Fixed comments and usings

* Fixed remote client to read http error message

---------

Co-authored-by: Shankar Reddy Sama <shsama@microsoft.com>
…onAsync and fix session query in ContainsSessionAsync (Azure#900)

* [AzureServiceFabric] Fix ArgumentNullException in CompleteOrchestrationAsync

* Use OrchestrationInstance while finding the session to avoid conflicts

---------

Co-authored-by: Shankar Reddy Sama <shsama@microsoft.com>
… to 2.3.9 (Azure#902)

Co-authored-by: Shankar Reddy Sama <shsama@microsoft.com>
…es (Azure#891)

* add randomization to blob names when uploading history, to prevent races in split-brain situations

* track all the blobs associated with an execution, and remove them when updating the tracking store after a continue-as-new

* modify blobName slightly so existing tests still pass.

* address PR feedback

* address PR feedback.

* Apply suggestions from code review

Co-authored-by: David Justo <david.justo.1996@gmail.com>

* address PR feedback

---------

Co-authored-by: David Justo <david.justo.1996@gmail.com>
@cgillum
Copy link
Collaborator

cgillum commented May 31, 2023

/azp run

@azure-pipelines
Copy link

Azure Pipelines could not run because the pipeline triggers exclude this branch/path.

Copy link
Collaborator

@cgillum cgillum left a comment

Choose a reason for hiding this comment

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

Ah, I forgot that we can't run the pipeline on a branch currently. We really need to update to the latest YAML-based ADO pipeline infrastructure. :)

Anyways, the changes look good to me!

@cgillum cgillum merged commit cd477c7 into Azure:azure-storage-v12 May 31, 2023
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants