diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupCommands.java hbase-client/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupCommands.java index 9a8697a..63f7a55 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupCommands.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupCommands.java @@ -482,7 +482,11 @@ public final class BackupCommands { try(final Connection conn = ConnectionFactory.createConnection(conf); final BackupAdmin admin = conn.getAdmin().getBackupAdmin();){ BackupSet set = admin.getBackupSet(setName); - System.out.println(set); + if(set == null) { + System.out.println("Set '"+setName+"' does not exist."); + } else{ + System.out.println(set); + } } } diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupSystemTable.java hbase-client/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupSystemTable.java index 777d916..d6be98c 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupSystemTable.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupSystemTable.java @@ -630,7 +630,7 @@ public final class BackupSystemTable implements Closeable { table = connection.getTable(tableName); Get get = BackupSystemTableHelper.createGetForBackupSet(name); Result res = table.get(get); - if(res.isEmpty()) return new ArrayList(); + if(res.isEmpty()) return null; res.advance(); String[] tables = BackupSystemTableHelper.cellValueToBackupSet(res.current()); diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseBackupAdmin.java hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseBackupAdmin.java index e86fe97..a6532df 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseBackupAdmin.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseBackupAdmin.java @@ -145,7 +145,9 @@ public class HBaseBackupAdmin implements BackupAdmin { List bslist = new ArrayList(); for (String s : list) { List tables = table.describeBackupSet(s); - bslist.add( new BackupSet(s, tables)); + if(tables != null){ + bslist.add( new BackupSet(s, tables)); + } } return bslist; } @@ -155,6 +157,7 @@ public class HBaseBackupAdmin implements BackupAdmin { public BackupSet getBackupSet(String name) throws IOException { try (final BackupSystemTable table = new BackupSystemTable(conn)) { List list = table.describeBackupSet(name); + if(list == null) return null; return new BackupSet(name, list); } } diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/backup/TestBackupSystemTable.java hbase-server/src/test/java/org/apache/hadoop/hbase/backup/TestBackupSystemTable.java index dfda854..90eac49 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/backup/TestBackupSystemTable.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/backup/TestBackupSystemTable.java @@ -462,7 +462,7 @@ public class TestBackupSystemTable { table.deleteBackupSet(setName); List tnames = table.describeBackupSet(setName); - assertTrue(tnames.size() == 0); + assertTrue(tnames == null); cleanBackupTable(); } }