Merge pull request #375 from experdb/develop

Develop

Author: swbyun

eXperDB-Management-Agent/src/main/java/com/k4m/dx/tcontrol/server/DxT053.java

@@ -5,8 +5,10 @@
 import java.io.BufferedReader;
 import java.io.FileReader;
 import java.net.Socket;
+import java.util.Iterator;
 
 import org.json.simple.JSONObject;
+import org.json.simple.parser.JSONParser;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.context.ApplicationContext;
@@ -17,6 +19,7 @@
 import com.k4m.dx.tcontrol.socket.ProtocolID;
 import com.k4m.dx.tcontrol.socket.SocketCtl;
 import com.k4m.dx.tcontrol.socket.TranCodeType;
+import com.k4m.dx.tcontrol.socket.client.ClientProtocolID;
 import com.k4m.dx.tcontrol.util.CommonUtil;
 import com.k4m.dx.tcontrol.util.RunCommandExec;
 
@@ -54,7 +57,6 @@ public void execute(String strDxExCode, JSONObject jObj) throws Exception {
 
 			String restoreType = String.valueOf(jObj.get(ProtocolID.RESTORE_FLAG));
 			String exelog = String.valueOf(jObj.get(ProtocolID.EXELOG));
-			
 			String restoreWrkName = String.valueOf(jObj.get(ProtocolID.WRK_NM));
 
 			vo.setEXELOG(exelog);
@@ -63,10 +65,30 @@ public void execute(String strDxExCode, JSONObject jObj) throws Exception {
 			if (restoreType.equals("full")) {
 				restoreCmd = "pgbackrest --stanza=experdb --config=$PGHOME/etc/pgbackrest/config/" + restoreWrkName + ".conf --delta restore > "
 						+ pgBlogPath + "/" + exelog + ".log";
-			} else {
+			} else if(restoreType.equals("pitr")){
 				String time_restore = String.valueOf(jObj.get(ProtocolID.TIME_RESTORE));
 				restoreCmd = "pgbackrest --stanza=experdb --config=$PGHOME/etc/pgbackrest/config/" + restoreWrkName + ".conf --type=time \"--target="
 						+ time_restore + "\" --target-action=promote --delta restore > " + pgBlogPath + "/" + exelog + ".log";
+			} else if(restoreType.equals("ropd")) {			
+				JSONParser parser = new JSONParser();
+				JSONObject jsonObject = (JSONObject) parser.parse(String.valueOf(jObj.get(ClientProtocolID.DBLIST_MAP)));
+				Iterator<String> dbListKeys = jsonObject.keySet().iterator();
+				
+				String dbListCmd = "";
+				
+				while(dbListKeys.hasNext()) {
+					String key = dbListKeys.next().toString();
+					
+					if(String.valueOf(jObj.get(ClientProtocolID.LIST_TYPE)).equals("include")) {
+						socketLogger.info("DxT053.value : " + String.valueOf(jsonObject.get(key)));
+						dbListCmd += " --db-include=" + String.valueOf(jsonObject.get(key));
+					}else if(String.valueOf(jObj.get(ClientProtocolID.LIST_TYPE)).equals("exclude")) {
+						dbListCmd += " --db-exclude=" + String.valueOf(jsonObject.get(key));
+					}
+				}
+				
+				restoreCmd = "pgbackrest --stanza=experdb --config=$PGHOME/etc/pgbackrest/config/" + restoreWrkName + ".conf" + dbListCmd + " --delta restore > "
+						+ pgBlogPath + "/" + exelog + ".log";
 			}
 
 			RunCommandExec r = new RunCommandExec(restoreCmd);

eXperDB-Management-Agent/src/main/java/com/k4m/dx/tcontrol/socket/client/ClientProtocolID.java

@@ -287,5 +287,6 @@ public class ClientProtocolID {
 	public static final String REMOTE_USR= "REMOTE_USR";
 	public static final String HOSTUSER= "HOSTUSER";
 	public static final String SSH_PORT= "SSH_PORT";
-	
+	public static final String DBLIST_MAP= "DBLIST_MAP";
+	public static final String LIST_TYPE= "LIST_TYPE";
 }

eXperDB-Management-WebConsole/pom.xml

@@ -5,7 +5,7 @@
    <groupId>com.k4m</groupId> 
    <artifactId>eXperDB-Management-WebConsole</artifactId>
    <packaging>war</packaging>
-   <version>v15.0.3</version>
+   <version>v15.0.4</version>
    <name>eXperDB-Management-WebConsole</name>
    <url>http://www.egovframe.go.kr</url>
 

eXperDB-Management-WebConsole/src/main/java/com/k4m/dx/tcontrol/cmmn/WebConsoleSetting.java

@@ -15,7 +15,7 @@ public class WebConsoleSetting {
 
 	public static void main(String[] args) throws Exception {
 		String strLanguage ="";
-		String strVersion ="eXperDB-Management-WebConsole-15.0.3";
+		String strVersion ="eXperDB-Management-WebConsole-15.0.4";
 
 		String strDatabaseIp = "";
 		String strDatabasePort = "";

eXperDB-Management-WebConsole/src/main/java/com/k4m/dx/tcontrol/cmmn/client/ClientProtocolID.java

@@ -316,5 +316,7 @@ public class ClientProtocolID {
 	public static final String REMOTE_USR= "REMOTE_USR";
 	public static final String HOSTUSER= "HOSTUSER";
 	public static final String SSH_PORT= "SSH_PORT";
+	public static final String DBLIST_MAP= "DBLIST_MAP";
+	public static final String LIST_TYPE= "LIST_TYPE";
 
 }

eXperDB-Management-WebConsole/src/main/java/com/k4m/dx/tcontrol/functions/schedule/service/WrkExeVO.java

@@ -27,6 +27,7 @@ public class WrkExeVO {
 	private long DB_SZ;
 	private int BACKREST_SCD_ID;
 	private String backrest_gbn;
+	private String remote_ip;
 
 	public int getExe_sn() {
 		return exe_sn;
@@ -235,6 +236,14 @@ public String getBackrest_gbn() {
 	public void setBackrest_gbn(String backrest_gbn) {
 		this.backrest_gbn = backrest_gbn;
 	}
+
+	public String getRemote_ip() {
+		return remote_ip;
+	}
+
+	public void setRemote_ip(String remote_ip) {
+		this.remote_ip = remote_ip;
+	}
 
 
 

eXperDB-Management-WebConsole/src/main/java/com/k4m/dx/tcontrol/restore/web/BackrestRestoreController.java

@@ -69,7 +69,12 @@ public ModelAndView backrestAllAgentList(@ModelAttribute("workVo") WorkVO workVO
 			if(!wrkExeVO.equals(null)) {
 				resultCode = "S";
 
+				mv.addObject("db_svr_nm", backupService.selectDbSvrNm(workVO).getDb_svr_nm());
 				mv.addObject("backrest_gbn", wrkExeVO.getBackrest_gbn());
+				
+				if(wrkExeVO.getBackrest_gbn().equals("remote")) {
+					mv.addObject("remote_ip", wrkExeVO.getRemote_ip());
+				}
 			}
 
 		} catch (Exception e) {
@@ -220,6 +225,9 @@ public void executeBackrestRestore(@ModelAttribute("workVo") WorkVO workVO, @Mod
 			jObj.put(ClientProtocolID.RESTORE_FLAG, request.getParameter("restore_type"));
 			jObj.put(ClientProtocolID.TIME_RESTORE, request.getParameter("time_restore"));
 
+			jObj.put(ClientProtocolID.DBLIST_MAP, paramMap.get("dbList_map"));
+			jObj.put(ClientProtocolID.LIST_TYPE, request.getParameter("list_type"));
+			
 			ClientInfoCmmn cic = new ClientInfoCmmn();
 			JSONObject result = new JSONObject(); 
 
@@ -351,7 +359,6 @@ public void createBackrestRestoreConfig(WorkVO workVO, DbServerVO dbServerVO, Ht
 					}
 				}
 			}else {
-				System.out.println(paramMap.get("cloud_map"));
 				jObj.put(ClientProtocolID.CLOUD_MAP, paramMap.get("cloud_map"));
 			}
 

eXperDB-Management-WebConsole/src/main/resources/egovframework/sql/latest/eXperDB-Management_RepoDB-Install.sh

@@ -7,7 +7,7 @@ if [ ${1:-} == "A" ]; then
 fi
 
 echo "****************************************************"
-echo "eXperDB-Management-15.0.3 Repository DB Install"
+echo "eXperDB-Management-15.0.4 Repository DB Install"
 echo "****************************************************"
 
 echo "**CREATE USER experdb**"
@@ -105,4 +105,8 @@ echo "**14.0.3 END**"
 
 echo "**15.0.0**"
 psql -U experdb -d experdb -f eXperDB-Management_15.0.0.sql
-echo "**15.0.0 END**"
+echo "**15.0.0 END**"
+
+echo "**15.0.3**"
+psql -U experdb -d experdb -f eXperDB-Management_15.0.3.sql
+echo "**15.0.3 END**"

eXperDB-Management-WebConsole/src/main/resources/egovframework/sqlmap/mappers/backup/backupSql.xml

@@ -1273,12 +1273,14 @@
 	        B.db_svr_ipadr_id,
             B.bck_file_pth,
             B.wrk_id,
-            A.backrest_gbn
+            A.backrest_gbn,
+            A.remote_ip
           FROM T_BCK_WRKCNG_I A, T_WRKEXE_G B
           WHERE
           		A.DB_SVR_ID = #{db_svr_id}
           		AND B.WRK_ID = A.WRK_ID
            		AND B.exe_rslt_cd = 'TC001701'
+           		AND A.bck_bsn_dscd = 'TC000205'
 				order by wrk_end_dtm desc limit 1;
     </select>
 </mapper>

eXperDB-Management-WebConsole/src/main/resources/egovframework/tcontrolProps/globals_default.properties

@@ -1,7 +1,7 @@
 #
 #Thu Feb 24 06:53:01 UTC 2022
 lang=ko
-version=eXperDB-Management-WebConsole-15.0.3
+version=eXperDB-Management-WebConsole-15.0.4
 database.username=ENC(FjsPJj2xBs3gL1GH7mACfw\=\=)
 database.password=ENC(KeX0QrXzGcewYGJ4oIWEyUa320+oR7nK)
 database.url=ENC(acPqa+VFwBt0M47drdxfV009U7nRk/mIwyH0VPurNuWt7QetZmxYhGjXLdWq3yZwcEsgGpVAhQ0\=)