Skip to content

Improved Backup Index API. Raise prerelease version of the Search. #2200

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

Merged
kavics merged 6 commits into from
Apr 2, 2025
Merged

Improved Backup Index API. Raise prerelease version of the Search. #2200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6d36065
Add TargetPath property to the BackupInfo. Raise prerelease version o…
kavics Mar 20, 2025
e110204
Fix BackupInfo.Clone()
kavics Mar 21, 2025
3b6bfa8
Add "IndexBackupDirectory" keys to appConfigs.
kavics Mar 21, 2025
d6d4740
Remove magic string from health apikeys
kavics Mar 21, 2025
dc368ff
Add App_Data/IndexBackup to gitignore
kavics Mar 21, 2025
3cc524a
The "target" param of the BackupIndex endpoint is optional.
kavics Mar 21, 2025
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,5 +260,6 @@ paket-files/
/src/Services.Core.Install/*.zip
**/App_Data/LuceneIndex
**/App_Data/LocalIndex
**/App_Data/IndexBackup
**/App_Data/Logs
/src/WebApps/**/install-services-core
2 changes: 1 addition & 1 deletion src/ContentRepository/RepositoryTools.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -585,7 +585,7 @@ public static string CopyExplicitEntriesOfEveryoneToVisitor(Content root, string
[ODataAction(Category = "Indexing")]
[ContentTypes(N.CT.PortalRoot)]
[AllowedRoles(N.R.Administrators, N.R.Developers)]
public static async STT.Task<BackupResponse> BackupIndex(Content content, string target)
public static async STT.Task<BackupResponse> BackupIndex(Content content, string target = null)
{
var engine = Providers.Instance.SearchEngine.IndexingEngine;
var response = await engine.BackupAsync(target, CancellationToken.None)
Expand Down
6 changes: 6 additions & 0 deletions src/Search/Indexing/BackupInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,11 @@ public class BackupInfo
/// </summary>
public DateTime FinishedAt { get; set; }
/// <summary>
/// Gets or sets the path of directory that contains the backed-up files.
/// Can be relative or absolute.
/// </summary>
public string TargetPath { get; set; }
/// <summary>
/// Gets or sets the total length of the files to be copied.
/// </summary>
public long TotalBytes { get; set; }
Expand Down Expand Up @@ -53,6 +58,7 @@ public BackupInfo Clone()
{
StartedAt = StartedAt,
FinishedAt = FinishedAt,
TargetPath = TargetPath,
TotalBytes = TotalBytes,
CopiedBytes = CopiedBytes,
CountOfFiles = CountOfFiles,
Expand Down
2 changes: 1 addition & 1 deletion src/Search/SenseNet.Search.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<Version>2.5.1-alpha.2</Version>
<Version>2.5.1-alpha.3</Version>
<AssemblyName>SenseNet.Search</AssemblyName>
<RootNamespace>SenseNet.Search</RootNamespace>
<Company>Sense/Net Inc.</Company>
Expand Down
2 changes: 1 addition & 1 deletion src/WebApps/SnWebApplication.Api.InMem.Admin/appsettings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"AddJwtCookie": true
},
"ApiKeys": {
"HealthCheckerUser": "__set_value_in_secret.json__"
"HealthCheckerUser": ""
}
}
}
2 changes: 1 addition & 1 deletion src/WebApps/SnWebApplication.Api.InMem.TokenAuth/appsettings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"AddJwtCookie": true
},
"ApiKeys": {
"HealthCheckerUser": "__set_value_in_secret.json__"
"HealthCheckerUser": ""
}
}
}
2 changes: 1 addition & 1 deletion src/WebApps/SnWebApplication.Api.Sql.Admin/appsettings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"AddJwtCookie": true
},
"ApiKeys": {
"HealthCheckerUser": "__set_value_in_secret.json__"
"HealthCheckerUser": ""
},
"Tracing": {
"StartupTraceCategories": ""
Expand Down
2 changes: 1 addition & 1 deletion src/WebApps/SnWebApplication.Api.Sql.SearchService.Admin/appsettings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"AddJwtCookie": true
},
"ApiKeys": {
"HealthCheckerUser": "__set_value_in_secret.json__"
"HealthCheckerUser": ""
},
"search": {
"service": {
Expand Down
2 changes: 1 addition & 1 deletion src/WebApps/SnWebApplication.Api.Sql.SearchService.TokenAuth.Preview/appsettings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"AddJwtCookie": true
},
"ApiKeys": {
"HealthCheckerUser": "__set_value_in_secret.json__"
"HealthCheckerUser": ""
},
"Email": {
"Server": "",
Expand Down
2 changes: 1 addition & 1 deletion src/WebApps/SnWebApplication.Api.Sql.SearchService.TokenAuth/appsettings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"AddJwtCookie": true
},
"ApiKeys": {
"HealthCheckerUser": "__set_value_in_secret.json__"
"HealthCheckerUser": ""
},
"Email": {
"Server": "",
Expand Down
5 changes: 4 additions & 1 deletion src/WebApps/SnWebApplication.Api.Sql.TokenAuth.Preview/appsettings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,11 @@
"AddJwtCookie": true
},
"ApiKeys": {
"HealthCheckerUser": "__set_value_in_secret.json__"
"HealthCheckerUser": ""
},
//"lucene29": {
// "IndexBackupDirectory": "App_Data\\IndexBackup"
//},
"Email": {
"Server": "",
"Port": 587
Expand Down
5 changes: 4 additions & 1 deletion src/WebApps/SnWebApplication.Api.Sql.TokenAuth/appsettings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,11 @@
// "AddJwtCookie": false
//},
"ApiKeys": {
"HealthCheckerUser": "__set_value_in_secret.json__"
"HealthCheckerUser": ""
},
//"lucene29": {
// "IndexBackupDirectory": "App_Data\\IndexBackup"
//},
"Email": {
"Server": "",
"Port": 587
Expand Down