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

v20.03: fix(backup/restore): fixes backup and restore with DROP operations (G… #6933

Merged
merged 3 commits into from
Nov 23, 2020

Conversation

abhimanyusinghgaur
Copy link
Contributor

@abhimanyusinghgaur abhimanyusinghgaur commented Nov 20, 2020

…RAPHQL-735) (#6844)

Fixes GRAPHQL-735.
See RFC for more details.

(cherry picked from commit 3179f57)

# Conflicts:
# dgraph/cmd/alpha/run_test.go
# dgraph/cmd/bulk/systest/test-bulk-schema.sh
# edgraph/server.go
# ee/acl/acl_test.go
# graphql/e2e/common/admin.go
# graphql/e2e/directives/schema_response.json
# graphql/e2e/normal/schema_response.json
# graphql/e2e/schema/schema_test.go
# protos/pb.proto
# protos/pb/pb.pb.go
# schema/schema.go
# systest/backup/encryption/backup_test.go
# systest/backup/filesystem/backup_test.go
# systest/backup/minio/backup_test.go
# systest/export/export_test.go
# systest/mutations_test.go
# systest/online-restore/online_restore_test.go
# systest/queries_test.go
# testutil/graphql.go
# tlstest/mtls_internal/backup/encryption/backup_test.go
v# tlstest/mtls_internal/backup/filesystem/backup_test.go
# tlstest/mtls_internal/backup/minio/backup_test.go
# worker/backup_common.go
# worker/backup_processor.go
# worker/export.go
# worker/file_handler.go
# worker/online_restore_ee.go
# worker/restore.go
# x/keys.go
# x/x.go

Note:
Online Restore didn't exist in v20.03, it came into existence in v20.07, so the corresponding changes from the original PR have been discarded. There was only the dgraph restore command in v20.03 using which one can restore from a binary backup.


This change is Reviewable

Docs Preview: Dgraph Preview

…RAPHQL-735) (#6844)

Fixes GRAPHQL-735.
See [RFC](https://discuss.dgraph.io/t/backup-and-restore-with-operations-like-drop-all/11218) for more details.

(cherry picked from commit 3179f57)

# Conflicts:
#	dgraph/cmd/alpha/run_test.go
#	dgraph/cmd/bulk/systest/test-bulk-schema.sh
#	edgraph/server.go
#	ee/acl/acl_test.go
#	graphql/e2e/common/admin.go
#	graphql/e2e/directives/schema_response.json
#	graphql/e2e/normal/schema_response.json
#	graphql/e2e/schema/schema_test.go
#	protos/pb.proto
#	protos/pb/pb.pb.go
#	schema/schema.go
#	systest/backup/encryption/backup_test.go
#	systest/backup/filesystem/backup_test.go
#	systest/backup/minio/backup_test.go
#	systest/export/export_test.go
#	systest/mutations_test.go
#	systest/online-restore/online_restore_test.go
#	systest/queries_test.go
#	testutil/graphql.go
#	tlstest/mtls_internal/backup/encryption/backup_test.go
#	tlstest/mtls_internal/backup/filesystem/backup_test.go
#	tlstest/mtls_internal/backup/minio/backup_test.go
#	worker/backup_common.go
#	worker/backup_processor.go
#	worker/export.go
#	worker/file_handler.go
#	worker/online_restore_ee.go
#	worker/restore.go
#	x/keys.go
#	x/x.go
@abhimanyusinghgaur abhimanyusinghgaur merged commit 80747ed into release/v20.03 Nov 23, 2020
@abhimanyusinghgaur abhimanyusinghgaur deleted the abhimanyu/cp-20.03 branch November 23, 2020 11:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

2 participants