On Wed, Mar 13, 2019 at 1:38 PM Michael Paquier <michael@paquier.xyz> wrote:
On Tue, Mar 12, 2019 at 06:23:01PM +0900, Michael Paquier wrote: > And you are pointing out to the correct commit. The issue is that > process_target_file() has added a call to check_file_excluded(), and > this skips all the folders which it thinks can be skipped. One > problem though is that we also filter out pg_internal.init, which is > present in each database folder, and remains in the target directory > marked for deletion. Then, when the deletion happens, the failure > happens as the directory is not fully empty.
Okay, here is a refined patch with better comments, the addition of a test case (creating tables in the new databases in 002_databases.pl is enough to trigger the problem).
I have not looked into the patch but quick test show it has fixed the above issue.
[mithuncy@localhost pgrewindbin]$ ./bin/pg_rewind -D standby --source-server="host=127.0.0.1 port=5432 user=mithuncy dbname=postgres" -n servers diverged at WAL location 0/3000000 on timeline 1 rewinding from last common checkpoint at 0/2000060 on timeline 1 Done! [mithuncy@localhost pgrewindbin]$ ./bin/pg_rewind -D standby --source-server="host=127.0.0.1 port=5432 user=mithuncy dbname=postgres" servers diverged at WAL location 0/3000000 on timeline 1 rewinding from last common checkpoint at 0/2000060 on timeline 1 Done!