已合并
目标端数据库状态异常时，创建迁移任务时，目标端数据库不显示 #529
AtomGit-Bot创建于 2023年12月26日
目标端数据库状态异常时，创建迁移任务时，目标端数据库不显示 #529
已合并
共 2 个文件变更+3-8
MopenGauss-datakit/visualtool-common/src/main/java/org/opengauss/admin/common/utils/ops/JdbcUtil.java+2-2
| @@ -132,8 +132,8 @@ public class JdbcUtil { | |||
| 132 | String permissionStr = JdbcUtil.selectStringValue(pgConnection, | 132 | String permissionStr = JdbcUtil.selectStringValue(pgConnection, |
| 133 | "select rolsystemadmin from pg_roles where rolname= '" + user + "'", "rolsystemadmin"); | 133 | "select rolsystemadmin from pg_roles where rolname= '" + user + "'", "rolsystemadmin"); |
| 134 | isAdmin = permissionStr.equals("t") || permissionStr.equals("1"); | 134 | isAdmin = permissionStr.equals("t") || permissionStr.equals("1"); |
| 135 | - } catch (SQLException e) { | 135 | + } catch (OpsException | SQLException e) { |
| 136 | - log.error("sql execute failed."); | 136 | + log.error("get connection or sql execute failed."); |
| 137 | } finally { | 137 | } finally { |
| 138 | closeConnection(pgConnection); | 138 | closeConnection(pgConnection); |
| 139 | } | 139 | } |
Mplugins/data-migration/src/main/java/org/opengauss/admin/plugin/service/impl/MigrationTaskHostRefServiceImpl.java+1-6
| @@ -213,12 +213,7 @@ public class MigrationTaskHostRefServiceImpl extends ServiceImpl<MigrationTaskHo | |||
| 213 | } | 213 | } |
| 214 | eachOne.setBaseInfos(ListUtil.toList(hostInfo)); | 214 | eachOne.setBaseInfos(ListUtil.toList(hostInfo)); |
| 215 | eachOne.setInstallInfo(installHost); | 215 | eachOne.setInstallInfo(installHost); |
| 216 | - if (installHost.getInstallStatus().equals(PortalInstallStatus.INSTALLED.getCode())) { | 216 | + eachOne.setInstallPortalStatus(installHost.getInstallStatus()); |
| 217 | - boolean isInstallPortal = PortalHandle.checkInstallPortal(installHost.getHost(), installHost.getPort(), installHost.getRunUser(), password, installHost.getInstallPath()); | ||
| 218 | - eachOne.setInstallPortalStatus(isInstallPortal ? PortalInstallStatus.INSTALLED.getCode() : PortalInstallStatus.NOT_INSTALL.getCode()); | ||
| 219 | - } else { | ||
| 220 | - eachOne.setInstallPortalStatus(installHost.getInstallStatus()); | ||
| 221 | - } | ||
| 222 | } | 217 | } |
| 223 | return eachOne; | 218 | return eachOne; |
| 224 | }); | 219 | }); |