Blocker Description
Using -renameReserved to rename ".snapshot" in a pre-hdfs-snapshot feature fsimage during upgrade only works, if there is nothing under construction under the renamed directory. I am not sure whether it takes care of edits containing ".snapshot" properly.
The workaround is to identify these directories and rename, then do saveNamespace before performing upgrade.