[Major version upgrade] pg_upgrade fails despite passing check mode

[Abhishek Bhola <abhishek.bhola@xxxxxxxxxxxxxxx>]

While upgrading from Postgres 11 to 13, the pg_upgrade passed the check mode

postgres@dxxxpgs03:/Dxxxx1/datadg/data13$ /usr/pgsql-13/bin/pg_upgrade -k --check --new-datadir='/Dxxxx1/datadg/data13' --old-datadir='/Dxxxx1/datadg/data' --new-bind$
r='/usr/pgsql-13/bin' --old-bindir='/usr/pgsql-11/bin'
Performing Consistency Checks
-----------------------------
Checking cluster versions                                   ok
Checking database user is the install user                  ok
Checking database connection settings                       ok
Checking for prepared transactions                          ok
Checking for system-defined composite types in user tables  ok
Checking for reg* data types in user tables                 ok
Checking for contrib/isn with bigint-passing mismatch       ok
Checking for tables WITH OIDS                               ok
Checking for invalid "sql_identifier" user columns          ok
Checking for presence of required libraries                 ok
Checking database user is the install user                  ok
Checking for prepared transactions                          ok
Checking for new cluster tablespace directories             ok

*Clusters are compatible*

But then while performing the actual upgrade, it failed saying the "owner of a FDW should be a super user"

So I started the old Postgres 11 again, changed the owner of that FDW to a super user.

Now when I try to run the upgrade (even in check mode) again, it says "new cluster tablespace directory already exists"

Is it safe to delete the new tablespace directories?

What are my options to safely start/upgrade the DB without any chances of data corruption? 

Thanks

This correspondence (including any attachments) is for the intended recipient(s) only. It may contain confidential or privileged information or both. No confidentiality or privilege is waived or lost by any mis-transmission. If you receive this correspondence by mistake, please contact the sender immediately, delete this correspondence (and all attachments) and destroy any hard copies. You must not use, disclose, copy, distribute or rely on any part of this correspondence (including any attachments) if you are not the intended recipient(s).本メッセージに記載および添付されている情報（以下、総称して「本情報」といいます。）は、本来の受信者による使用のみを意図しています。誤送信等により本情報を取得された場合でも、本情報に係る秘密、または法律上の秘匿特権が失われるものではありません。本電子メールを受取られた方が、本来の受信者ではない場合には、本情報及びそのコピーすべてを削除・破棄し、本電子メールが誤って届いた旨を発信者宛てにご通知下さいますようお願いします。本情報の閲覧、発信または本情報に基づくいかなる行為も明確に禁止されていることをご了承ください。