Remove all references to Archiver (#718)

* Remove all references to Archiver

* Revert example-plugin version change

build.gradle

@@ -139,13 +139,6 @@ task luceneServerClient(type: CreateStartScripts) {
     classpath = startScripts.classpath
 }
 
-task backupRestoreTool(type: CreateStartScripts) {
-    mainClass = 'com.yelp.nrtsearch.server.cli.BackupRestoreCommand'
-    applicationName = 'backup-restore'
-    outputDir = new File(project.buildDir, 'tmp-app')
-    classpath = startScripts.classpath
-}
-
 task nrtUtils(type: CreateStartScripts) {
     mainClass = 'com.yelp.nrtsearch.tools.nrt_utils.NrtUtilsCommand'
     applicationName = 'nrt_utils'
@@ -156,7 +149,6 @@ task nrtUtils(type: CreateStartScripts) {
 applicationDistribution.into('bin') {
     from(luceneServer)
     from(luceneServerClient)
-    from(backupRestoreTool)
     from(nrtUtils)
     fileMode = 0755
 }

docker-compose-config/lucene_server_configuration_primary.yaml

@@ -10,7 +10,6 @@ threadPoolConfiguration:
 fileSendDelay: false
 botoCfgPath: "/user/app/boto.cfg"
 bucketName: "nrtsearch-bucket"
-archiveDirectory: "/user/app/primary_index_archiver"
 serviceName: "nrtsearch-service-test"
 restoreState: False
 downloadAsStream: "true"

docker-compose-config/lucene_server_configuration_replica.yaml

@@ -9,7 +9,6 @@ threadPoolConfiguration:
   maxIndexingThreads: 4
 botoCfgPath: "/user/app/boto.cfg"
 bucketName: "nrtsearch-bucket"
-archiveDirectory: "/user/app/replica_index_archiver"
 serviceName: "nrtsearch-service-test"
 restoreState: False
 downloadAsStream: "true"

docs/server_configuration.rst

@@ -24,7 +24,6 @@ Example server configuration
   fileSendDelay: false
   botoCfgPath: "/user/app/boto.cfg"
   bucketName: "nrtsearch-bucket"
-  archiveDirectory: "/user/app/primary_index_archiver"
   serviceName: "nrtsearch-service-test"
   restoreState: False
   downloadAsStream: "true"
@@ -72,7 +71,7 @@ Example server configuration
    * - bucketName
      - str
      - Name of bucket to use for external storage
-     - DEFAULT_ARCHIVE_BUCKET
+     - DEFAULT_REMOTE_BUCKET
 
    * - maxS3ClientRetries
      - int
@@ -84,11 +83,6 @@ Example server configuration
      - Path to AWS credentials (if using S3 for remote storage); Will use the DefaultAWSCredentialsProviderChain if omitted.
      - null
 
-   * - archiveDirectory
-     - str
-     - Directory for uploading/downloading from external storage. 
-     - `<DEFAULT_USER_DIR> <https://github.com/Yelp/nrtsearch/blob/f612f5d3e14e468ab8c9b45dd4be0ab84231b9de/src/main/java/com/yelp/nrtsearch/server/config/LuceneServerConfiguration.java#L35>`_/archiver
-
    * - downloadAsStream
      - bool
      - If enabled, the content downloader will perform a streaming extraction of tar archives from remote storage to disk. Otherwise, the downloader will only extract after finishing downloading the archive to disk.

example-plugin/build.gradle

@@ -22,13 +22,6 @@ java {
 group 'com.yelp.nrtsearch.plugins'
 version '0.0.1'
 
-repositories {
-    mavenCentral()
-    maven {
-        url = uri("https://oss.sonatype.org/content/repositories/snapshots/")
-    }
-}
-
 ext {
     assertjVersion = '3.26.3'
     grpcVersion = "1.66.0"

src/main/java/com/yelp/nrtsearch/BackendModule.java

@@ -0,0 +1,33 @@
+/*
+ * Copyright 2021 Yelp Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.yelp.nrtsearch;
+
+import com.amazonaws.services.s3.AmazonS3;
+import com.google.inject.*;
+import com.yelp.nrtsearch.server.config.LuceneServerConfiguration;
+import com.yelp.nrtsearch.server.remote.RemoteBackend;
+import com.yelp.nrtsearch.server.remote.s3.S3Backend;
+
+public class BackendModule extends AbstractModule {
+
+  @Inject
+  @Singleton
+  @Provides
+  protected RemoteBackend providesRemoteBackend(
+      LuceneServerConfiguration configuration, AmazonS3 s3) {
+    return new S3Backend(configuration, s3);
+  }
+}

src/main/java/com/yelp/nrtsearch/LuceneServerModule.java

@@ -40,7 +40,7 @@ public LuceneServerModule(LuceneServer.LuceneServerCommand args) {
   @Override
   protected void configure() {
     install(new S3Module());
-    install(new ArchiverModule());
+    install(new BackendModule());
   }
 
   @Inject