Cherry pick upgrade bugs fixes PR #3178 #3154 to master#3182

qiaojialin merged 2 commits intomasterapache/iotdb:masterfrom

upgrade_but1apache/iotdb:upgrade_but1Copy head branch name to clipboard