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

Make code sequential and remove deadlock #3210

Merged
merged 6 commits into from Mar 27, 2019

Conversation

srfrog
Copy link
Contributor

@srfrog srfrog commented Mar 26, 2019

This change is Reviewable

@srfrog srfrog requested a review from a team March 26, 2019 01:12
Copy link
Contributor

@manishrjain manishrjain left a comment

Choose a reason for hiding this comment

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

Reviewable status: 0 of 1 files reviewed, 1 unresolved discussion (waiting on @srfrog)


ee/backup/s3_handler.go, line 216 at r1 (raw file):

	readManifests := func(objects []string) (map[int]*Manifest, error) {
		res := make(map[int]*Manifest)

We don't need to read all the manifests. Just the ones until the first full backup.

Copy link
Contributor Author

@srfrog srfrog left a comment

Choose a reason for hiding this comment

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

Reviewable status: 0 of 1 files reviewed, 1 unresolved discussion (waiting on @manishrjain)


ee/backup/s3_handler.go, line 216 at r1 (raw file):

Previously, manishrjain (Manish R Jain) wrote…

We don't need to read all the manifests. Just the ones until the first full backup.

We read the manifest to know which files to restore.

@srfrog srfrog added the exp/beginner Something most people could solve. label Mar 26, 2019
Copy link

@gitlw gitlw left a comment

Choose a reason for hiding this comment

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

:lgtm:

Reviewable status: 0 of 3 files reviewed, 1 unresolved discussion (waiting on @manishrjain)

@srfrog srfrog merged commit a649e01 into master Mar 27, 2019
@srfrog srfrog deleted the srfrog/backup_remove_deadlock_and_simplify branch March 27, 2019 16:53
dna2github pushed a commit to dna2fork/dgraph that referenced this pull request Jul 19, 2019
* make code sequential and remove deadlock

* simplify code further

* worker/backup_ee.go: unwarned change that broke tests after merge

* ee/backup/docker-compose.yml: add user to docker compose file to fix testing in Linux

* ee/backup/docker-compose.yml: add --cwd to docker service command to fix dir ownership

* ee/backup/docker-compose.yml: remove working_dir it interferes with Linux testing
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
exp/beginner Something most people could solve.
Development

Successfully merging this pull request may close these issues.

None yet

3 participants