Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove all references to Archiver #718

Merged
merged 2 commits into from
Sep 18, 2024
Merged

Remove all references to Archiver #718

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
63d74b9
Remove all references to Archiver
aprudhomme Sep 17, 2024
ab52631
Revert example-plugin version change
aprudhomme Sep 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -156,7 +149,6 @@ task nrtUtils(type: CreateStartScripts) {
applicationDistribution.into('bin') {
from(luceneServer)
from(luceneServerClient)
from(backupRestoreTool)
from(nrtUtils)
fileMode = 0755
}
Expand Down
1 change: 0 additions & 1 deletion docker-compose-config/lucene_server_configuration_primary.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
1 change: 0 additions & 1 deletion docker-compose-config/lucene_server_configuration_replica.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
8 changes: 1 addition & 7 deletions docs/server_configuration.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand All @@ -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.
Expand Down
7 changes: 0 additions & 7 deletions example-plugin/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,6 @@ java {
group 'com.yelp.nrtsearch.plugins'
version '0.0.1'

repositories {
mavenCentral()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we still keep mavenCentral() here?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are two repositories blocks in this file for some reason https://github.com/Yelp/nrtsearch/pull/718/files/ab52631be40ff6bee2a75a7b58b93428d0547bfc#diff-ea04739ba1d9c1327164c174b91d0ed9ff951aee3753257514de672b9bf23b84R9

maven {
url = uri("https://oss.sonatype.org/content/repositories/snapshots/")
}
}

ext {
assertjVersion = '3.26.3'
grpcVersion = "1.66.0"
Expand Down
15 changes: 15 additions & 0 deletions grpc-gateway/luceneserver.swagger.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1989,6 +1989,18 @@
}
}
},
"ScriptParamFloatVectorValue": {
"type": "object",
"properties": {
"values": {
"type": "array",
"items": {
"type": "number",
"format": "float"
}
}
}
},
"ScriptParamListValue": {
"type": "object",
"properties": {
Expand Down Expand Up @@ -2054,6 +2066,9 @@
},
"structValue": {
"$ref": "#/definitions/ScriptParamStructValue"
},
"floatVectorValue": {
"$ref": "#/definitions/ScriptParamFloatVectorValue"
}
},
"title": "script parameter entry"
Expand Down
Loading
Loading