236423 2022-02-09 18:21:08 -0800 Exclude new LocalStorage directory from backup on iOS 2022-02-17 23:47:17 -0800 1 1 1 Unclassified WebKit Website Storage WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 sihui_liu sihui_liu cdumez darin sihui_liu webkit-bug-importer oldest_to_newest 1839489 0 sihui_liu 2022-02-09 18:21:08 -0800 ... 1842643 1 webkit-bug-importer 2022-02-16 18:22:16 -0800 <rdar://problem/89060863> 1842694 2 452308 sihui_liu 2022-02-16 21:15:15 -0800 Created attachment 452308 Patch 1842771 3 452308 darin 2022-02-17 01:10:22 -0800 Comment on attachment 452308 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=452308&action=review > Source/WebKit/ChangeLog:10 > + We've been excluding LocalStorage data from backup on iOS since r212555, and we need to make sure this applies > + to new LocalStorage directory after migration (r289878). What about on devices where the old code ran, the directory was created, but excludeFromBackup was not called? Are those devices permanently in an incorrect state? What will heal them? 1842971 4 452308 sihui_liu 2022-02-17 10:49:17 -0800 Comment on attachment 452308 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=452308&action=review >> Source/WebKit/ChangeLog:10 >> + to new LocalStorage directory after migration (r289878). > > What about on devices where the old code ran, the directory was created, but excludeFromBackup was not called? Are those devices permanently in an incorrect state? What will heal them? The new LocalStorage directory is not in use yet: r289878 only adds code for migration. So this code is added before the directory is created. I am trying to make sure everything works correctly before we start to use the new directory. 1842992 5 452308 darin 2022-02-17 11:25:49 -0800 Comment on attachment 452308 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=452308&action=review >>> Source/WebKit/ChangeLog:10 >>> + to new LocalStorage directory after migration (r289878). >> >> What about on devices where the old code ran, the directory was created, but excludeFromBackup was not called? Are those devices permanently in an incorrect state? What will heal them? > > The new LocalStorage directory is not in use yet: r289878 only adds code for migration. So this code is added before the directory is created. I am trying to make sure everything works correctly before we start to use the new directory. Sounds good 1843284 6 452483 sihui_liu 2022-02-17 22:33:06 -0800 Created attachment 452483 Patch for landing 1843303 7 ews-feeder 2022-02-17 23:47:14 -0800 Committed r290115 (247459@main): <https://commits.webkit.org/247459@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 452483. 452308 2022-02-16 21:15:15 -0800 2022-02-17 22:33:03 -0800 Patch bug-236423-20220216211514.patch text/plain 2721 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjg5OTgyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDZjNTk4OTJiYTIxN2I1OTEz M2U4ZDFkYzczYTQ2NTBlZmQzNjRjMGYuLjIwOTk5YjdlNzRkY2YwNzE3NWViNzk1Yzk4YjhmMDNk NDRmMWM4YTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMjItMDItMTYgIFNpaHVpIExp dSAgPHNpaHVpX2xpdUBhcHBsZS5jb20+CisKKyAgICAgICAgRXhjbHVkZSBuZXcgTG9jYWxTdG9y YWdlIGRpcmVjdG9yeSBmcm9tIGJhY2t1cCBvbiBpT1MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNjQyMworICAgICAgICA8cmRhcjovL3Byb2JsZW0v ODkwNjA4NjM+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgV2UndmUgYmVlbiBleGNsdWRpbmcgTG9jYWxTdG9yYWdlIGRhdGEgZnJvbSBiYWNrdXAgb24g aU9TIHNpbmNlIHIyMTI1NTUsIGFuZCB3ZSBuZWVkIHRvIG1ha2Ugc3VyZSB0aGlzIGFwcGxpZXMK KyAgICAgICAgdG8gbmV3IExvY2FsU3RvcmFnZSBkaXJlY3RvcnkgYWZ0ZXIgbWlncmF0aW9uIChy Mjg5ODc4KS4KKworICAgICAgICBNYW51YWxseSB0ZXN0ZWQgb24gaU9TIGRldmljZS4KKworICAg ICAgICAqIE5ldHdvcmtQcm9jZXNzL3N0b3JhZ2UvT3JpZ2luU3RvcmFnZU1hbmFnZXIuY3BwOgor ICAgICAgICAoV2ViS2l0OjpPcmlnaW5TdG9yYWdlTWFuYWdlcjo6U3RvcmFnZUJ1Y2tldDo6cmVz b2x2ZWRMb2NhbFN0b3JhZ2VQYXRoKToKKwogMjAyMi0wMi0xNSAgTXlsZXMgQy4gTWF4ZmllbGQg IDxtbWF4ZmllbGRAYXBwbGUuY29tPgogCiAgICAgICAgIFtXZWJHUFVdIFVwZGF0ZSBJRExzIGFu ZCBzdHVicyB0byBsYXRlc3QgdmVyc2lvbiBvZiB0aGUgc3BlYwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9zdG9yYWdlL09yaWdpblN0b3JhZ2VNYW5hZ2VyLmNwcCBi L1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mvc3RvcmFnZS9PcmlnaW5TdG9yYWdlTWFuYWdl ci5jcHAKaW5kZXggMTU2N2RlYTEyNzVlMzU0MWY2MGQ5YmIxNTYxODRjMWY1MjUxNDY4MC4uNDQ4 ZTdlNWYzNmUyMjk5MTExZTAwMjM4ODc2ZWZiN2E1OWRhOWRiOCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9zdG9yYWdlL09yaWdpblN0b3JhZ2VNYW5hZ2VyLmNwcAor KysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL3N0b3JhZ2UvT3JpZ2luU3RvcmFnZU1h bmFnZXIuY3BwCkBAIC0zNjEsMTUgKzM2MSwxOCBAQCBwcml2YXRlOgogICAgICAgICBpZiAobV9z aG91bGRVc2VDdXN0b21QYXRocykgewogICAgICAgICAgICAgQVNTRVJUKG1fY3VzdG9tTG9jYWxT dG9yYWdlUGF0aC5pc0VtcHR5KCkgPT0gbV9yb290UGF0aC5pc0VtcHR5KCkpOwogICAgICAgICAg ICAgbV9yZXNvbHZlZExvY2FsU3RvcmFnZVBhdGggPSBtX2N1c3RvbUxvY2FsU3RvcmFnZVBhdGg7 Ci0gICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICBhdXRvIGxvY2FsU3RvcmFnZVBhdGggPSBM b2NhbFN0b3JhZ2VNYW5hZ2VyOjpsb2NhbFN0b3JhZ2VGaWxlUGF0aCh0eXBlU3RvcmFnZVBhdGgo U3RvcmFnZVR5cGU6OkxvY2FsU3RvcmFnZSkpOwotICAgICAgICAgICAgaWYgKCFtX2N1c3RvbUxv Y2FsU3RvcmFnZVBhdGguaXNFbXB0eSgpICYmICFGaWxlU3lzdGVtOjpmaWxlRXhpc3RzKGxvY2Fs U3RvcmFnZVBhdGgpKSB7Ci0gICAgICAgICAgICAgICAgRmlsZVN5c3RlbTo6bWFrZUFsbERpcmVj dG9yaWVzKEZpbGVTeXN0ZW06OnBhcmVudFBhdGgobG9jYWxTdG9yYWdlUGF0aCkpOworICAgICAg ICB9IGVsc2UgaWYgKCFtX3Jvb3RQYXRoLmlzRW1wdHkoKSkgeworICAgICAgICAgICAgYXV0byBs b2NhbFN0b3JhZ2VEaXJlY3RvcnkgPSB0eXBlU3RvcmFnZVBhdGgoU3RvcmFnZVR5cGU6OkxvY2Fs U3RvcmFnZSk7CisgICAgICAgICAgICBGaWxlU3lzdGVtOjptYWtlQWxsRGlyZWN0b3JpZXMobG9j YWxTdG9yYWdlRGlyZWN0b3J5KTsKKyAgICAgICAgICAgIEZpbGVTeXN0ZW06OmV4Y2x1ZGVGcm9t QmFja3VwKGxvY2FsU3RvcmFnZURpcmVjdG9yeSk7CisKKyAgICAgICAgICAgIGF1dG8gbG9jYWxT dG9yYWdlUGF0aCA9IExvY2FsU3RvcmFnZU1hbmFnZXI6OmxvY2FsU3RvcmFnZUZpbGVQYXRoKGxv Y2FsU3RvcmFnZURpcmVjdG9yeSk7CisgICAgICAgICAgICBpZiAoIW1fY3VzdG9tTG9jYWxTdG9y YWdlUGF0aC5pc0VtcHR5KCkgJiYgIUZpbGVTeXN0ZW06OmZpbGVFeGlzdHMobG9jYWxTdG9yYWdl UGF0aCkpCiAgICAgICAgICAgICAgICAgV2ViQ29yZTo6U1FMaXRlRmlsZVN5c3RlbTo6bW92ZURh dGFiYXNlRmlsZShtX2N1c3RvbUxvY2FsU3RvcmFnZVBhdGgsIGxvY2FsU3RvcmFnZVBhdGgpOwot ICAgICAgICAgICAgfQogCiAgICAgICAgICAgICBtX3Jlc29sdmVkTG9jYWxTdG9yYWdlUGF0aCA9 IGxvY2FsU3RvcmFnZVBhdGg7Ci0gICAgICAgIH0KKyAgICAgICAgfSBlbHNlCisgICAgICAgICAg ICBtX3Jlc29sdmVkTG9jYWxTdG9yYWdlUGF0aCA9IGVtcHR5U3RyaW5nKCk7CiAKICAgICAgICAg cmV0dXJuIG1fcmVzb2x2ZWRMb2NhbFN0b3JhZ2VQYXRoOwogICAgIH0K 452483 2022-02-17 22:33:06 -0800 2022-02-17 23:47:16 -0800 Patch for landing bug-236423-20220217223305.patch text/plain 2703 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjkwMTEyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDkyNTIwNGRkNDFlMmI0NjBl YjQwMGI0NTU4ZWU4ODk4MDFjNDBmYTcuLjExZTM2YmJjYjAyMTExZDNmMjEzNTJmODU3YzMyM2Vi MWEzYWM0MTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMjItMDItMTcgIFNpaHVpIExp dSAgPHNpaHVpX2xpdUBhcHBsZS5jb20+CisKKyAgICAgICAgRXhjbHVkZSBuZXcgTG9jYWxTdG9y YWdlIGRpcmVjdG9yeSBmcm9tIGJhY2t1cCBvbiBpT1MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNjQyMworICAgICAgICA8cmRhcjovL3Byb2JsZW0v ODkwNjA4NjM+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQ2hyaXMgRHVtZXouCisKKyAgICAgICAg V2UndmUgYmVlbiBleGNsdWRpbmcgTG9jYWxTdG9yYWdlIGRhdGEgZnJvbSBiYWNrdXAgb24gaU9T IHNpbmNlIHIyMTI1NTUsIGFuZCB3ZSBuZWVkIHRvIG1ha2Ugc3VyZSB0aGlzIGFwcGxpZXMKKyAg ICAgICAgdG8gbmV3IExvY2FsU3RvcmFnZSBkaXJlY3RvcnkgYWZ0ZXIgbWlncmF0aW9uIChyMjg5 ODc4KS4KKworICAgICAgICBNYW51YWxseSB0ZXN0ZWQgb24gaU9TIGRldmljZS4KKworICAgICAg ICAqIE5ldHdvcmtQcm9jZXNzL3N0b3JhZ2UvT3JpZ2luU3RvcmFnZU1hbmFnZXIuY3BwOgorICAg ICAgICAoV2ViS2l0OjpPcmlnaW5TdG9yYWdlTWFuYWdlcjo6U3RvcmFnZUJ1Y2tldDo6cmVzb2x2 ZWRMb2NhbFN0b3JhZ2VQYXRoKToKKwogMjAyMi0wMi0xNyAgRGllZ28gUGlubyBHYXJjaWEgIDxk cGlub0BpZ2FsaWEuY29tPgogCiAgICAgICAgIFtHVEtdIERlYmlhbiBTdGFibGUgYnVpbGQgaXMg YnJva2VuIGFmdGVyIHIyOTAwMjYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1By b2Nlc3Mvc3RvcmFnZS9PcmlnaW5TdG9yYWdlTWFuYWdlci5jcHAgYi9Tb3VyY2UvV2ViS2l0L05l dHdvcmtQcm9jZXNzL3N0b3JhZ2UvT3JpZ2luU3RvcmFnZU1hbmFnZXIuY3BwCmluZGV4IDg1NzM2 Yjg5OWFiMWU1MTNiZDI0NTY3ZjMwZTY5ZGI2MDZlZDk2NWQuLjQxZTMxOGMwOTdmOTNkMjRlYWQ3 YzBiYzlkY2IxMTM0NGQ5MDU5N2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1By b2Nlc3Mvc3RvcmFnZS9PcmlnaW5TdG9yYWdlTWFuYWdlci5jcHAKKysrIGIvU291cmNlL1dlYktp dC9OZXR3b3JrUHJvY2Vzcy9zdG9yYWdlL09yaWdpblN0b3JhZ2VNYW5hZ2VyLmNwcApAQCAtMjUy LDE1ICsyNTIsMTggQEAgcHVibGljOgogICAgICAgICBpZiAobV9zaG91bGRVc2VDdXN0b21QYXRo cykgewogICAgICAgICAgICAgQVNTRVJUKG1fY3VzdG9tTG9jYWxTdG9yYWdlUGF0aC5pc0VtcHR5 KCkgPT0gbV9yb290UGF0aC5pc0VtcHR5KCkpOwogICAgICAgICAgICAgbV9yZXNvbHZlZExvY2Fs U3RvcmFnZVBhdGggPSBtX2N1c3RvbUxvY2FsU3RvcmFnZVBhdGg7Ci0gICAgICAgIH0gZWxzZSB7 Ci0gICAgICAgICAgICBhdXRvIGxvY2FsU3RvcmFnZVBhdGggPSBMb2NhbFN0b3JhZ2VNYW5hZ2Vy Ojpsb2NhbFN0b3JhZ2VGaWxlUGF0aCh0eXBlU3RvcmFnZVBhdGgoU3RvcmFnZVR5cGU6OkxvY2Fs U3RvcmFnZSkpOwotICAgICAgICAgICAgaWYgKCFtX2N1c3RvbUxvY2FsU3RvcmFnZVBhdGguaXNF bXB0eSgpICYmICFGaWxlU3lzdGVtOjpmaWxlRXhpc3RzKGxvY2FsU3RvcmFnZVBhdGgpKSB7Ci0g ICAgICAgICAgICAgICAgRmlsZVN5c3RlbTo6bWFrZUFsbERpcmVjdG9yaWVzKEZpbGVTeXN0ZW06 OnBhcmVudFBhdGgobG9jYWxTdG9yYWdlUGF0aCkpOworICAgICAgICB9IGVsc2UgaWYgKCFtX3Jv b3RQYXRoLmlzRW1wdHkoKSkgeworICAgICAgICAgICAgYXV0byBsb2NhbFN0b3JhZ2VEaXJlY3Rv cnkgPSB0eXBlU3RvcmFnZVBhdGgoU3RvcmFnZVR5cGU6OkxvY2FsU3RvcmFnZSk7CisgICAgICAg ICAgICBGaWxlU3lzdGVtOjptYWtlQWxsRGlyZWN0b3JpZXMobG9jYWxTdG9yYWdlRGlyZWN0b3J5 KTsKKyAgICAgICAgICAgIEZpbGVTeXN0ZW06OmV4Y2x1ZGVGcm9tQmFja3VwKGxvY2FsU3RvcmFn ZURpcmVjdG9yeSk7CisKKyAgICAgICAgICAgIGF1dG8gbG9jYWxTdG9yYWdlUGF0aCA9IExvY2Fs U3RvcmFnZU1hbmFnZXI6OmxvY2FsU3RvcmFnZUZpbGVQYXRoKGxvY2FsU3RvcmFnZURpcmVjdG9y eSk7CisgICAgICAgICAgICBpZiAoIW1fY3VzdG9tTG9jYWxTdG9yYWdlUGF0aC5pc0VtcHR5KCkg JiYgIUZpbGVTeXN0ZW06OmZpbGVFeGlzdHMobG9jYWxTdG9yYWdlUGF0aCkpCiAgICAgICAgICAg ICAgICAgV2ViQ29yZTo6U1FMaXRlRmlsZVN5c3RlbTo6bW92ZURhdGFiYXNlRmlsZShtX2N1c3Rv bUxvY2FsU3RvcmFnZVBhdGgsIGxvY2FsU3RvcmFnZVBhdGgpOwotICAgICAgICAgICAgfQogCiAg ICAgICAgICAgICBtX3Jlc29sdmVkTG9jYWxTdG9yYWdlUGF0aCA9IGxvY2FsU3RvcmFnZVBhdGg7 Ci0gICAgICAgIH0KKyAgICAgICAgfSBlbHNlCisgICAgICAgICAgICBtX3Jlc29sdmVkTG9jYWxT dG9yYWdlUGF0aCA9IGVtcHR5U3RyaW5nKCk7CiAKICAgICAgICAgcmV0dXJuIG1fcmVzb2x2ZWRM b2NhbFN0b3JhZ2VQYXRoOwogICAgIH0K