Yes, I will check into that. In this issue I was looking at only the empty datadir SST issue (and it was also breaking SST + xbstream + mysqld_safe). Hence, fixed this for this milestone itself. For the other cases, I will open a separate issue.

Just some food for thought: strictly speaking the user can configure grastate.dat file to be called differently and to be stored in a location different from mysql datadir. In fact, when we start to support multiple providers this will become a necessity. So ideally we must think of something better than checking a fixed file name.