May 1, 2024 · May 1, 2024 · Mar 9, 2024 · Mar 10, 2024 · Mar 10, 2024 · Mar 10, 2024
diff --git a/priam/src/main/java/com/netflix/priam/restore/AbstractRestore.java b/priam/src/main/java/com/netflix/priam/restore/AbstractRestore.java
 */
 public abstract class AbstractRestore extends Task implements IRestoreStrategy {
    private static final Logger logger = LoggerFactory.getLogger(AbstractRestore.class);
    private static final String JOBNAME = "AbstractRestore";
    private static final String SYSTEM_KEYSPACE = "system";
    private static BigInteger restoreToken;
    final IBackupFileSystem fs;
    final Sleeper sleeper;
    public AbstractRestore(
            IConfiguration config,
            IBackupFileSystem fs,
            String name,
            Sleeper sleeper,
            Provider<AbstractBackupPath> pathProvider,
            InstanceIdentity instanceIdentity,
     * @throws Exception If there is any error in downloading file from the remote file system.
     */
    protected abstract Future<Path> downloadFile(final AbstractBackupPath path) throws Exception;

    final class BoundedList<E> extends LinkedList<E> {

        private final int limit;

        BoundedList(int limit) {
            this.limit = limit;
        }

        @Override
        public boolean add(E o) {
            super.add(o);
            while (size() > limit) {
                super.remove();
            }
            return true;
        }
    }

    public final int getDownloadTasksQueued() {
        return fs.getDownloadTasksQueued();
    }
 }
diff --git a/priam/src/main/java/com/netflix/priam/restore/Restore.java b/priam/src/main/java/com/netflix/priam/restore/Restore.java
 import javax.inject.Inject;
 import javax.inject.Provider;
 import javax.inject.Singleton;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

 /** Main class for restoring data from backup. Backup restored using this way are not encrypted. */
 @Singleton
 public class Restore extends AbstractRestore {
    public static final String JOBNAME = "AUTO_RESTORE_JOB";
    private static final Logger logger = LoggerFactory.getLogger(Restore.class);

    @Inject
    public Restore(
        super(
                config,
                fs,
                JOBNAME,
                sleeper,
                pathProvider,
                instanceIdentity,
Original file line number	Diff line number	Diff line change
Expand Up		@@ -55,8 +55,6 @@
		*/
		public abstract class AbstractRestore extends Task implements IRestoreStrategy {
		private static final Logger logger = LoggerFactory.getLogger(AbstractRestore.class);
		private static final String JOBNAME = "AbstractRestore";
		private static final String SYSTEM_KEYSPACE = "system";
		private static BigInteger restoreToken;
		final IBackupFileSystem fs;
		final Sleeper sleeper;
Expand All		@@ -75,7 +73,6 @@ public abstract class AbstractRestore extends Task implements IRestoreStrategy {
		public AbstractRestore(
		IConfiguration config,
		IBackupFileSystem fs,
		String name,
		Sleeper sleeper,
		Provider<AbstractBackupPath> pathProvider,
		InstanceIdentity instanceIdentity,
Expand DownExpand Up		@@ -267,26 +264,4 @@ public void restore(DateUtil.DateRange dateRange) throws Exception {
		* @throws Exception If there is any error in downloading file from the remote file system.
		*/
		protected abstract Future<Path> downloadFile(final AbstractBackupPath path) throws Exception;

		final class BoundedList<E> extends LinkedList<E> {

		private final int limit;

		BoundedList(int limit) {
		this.limit = limit;
		}

		@Override
		public boolean add(E o) {
		super.add(o);
		while (size() > limit) {
		super.remove();
		}
		return true;
		}
		}

		public final int getDownloadTasksQueued() {
		return fs.getDownloadTasksQueued();
		}
		}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -30,14 +30,11 @@
		import javax.inject.Inject;
		import javax.inject.Provider;
		import javax.inject.Singleton;
		import org.slf4j.Logger;
		import org.slf4j.LoggerFactory;

		/** Main class for restoring data from backup. Backup restored using this way are not encrypted. */
		@Singleton
		public class Restore extends AbstractRestore {
		public static final String JOBNAME = "AUTO_RESTORE_JOB";
		private static final Logger logger = LoggerFactory.getLogger(Restore.class);

		@Inject
		public Restore(
Expand All		@@ -53,7 +50,6 @@ public Restore(
		super(
		config,
		fs,
		JOBNAME,
		sleeper,
		pathProvider,
		instanceIdentity,
Expand Down