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

Adds support for custom TTL of repaired docs and ViewQueryPageSize defaults #2902

Merged
merged 3 commits into from
Sep 14, 2017
Merged

Adds support for custom TTL of repaired docs and ViewQueryPageSize defaults #2902

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ebddb81
Added support for custom TTL on repaired docs and default value for R…
Sep 14, 2017
0a52482
Added custom TTL for Repaired docs
Sep 14, 2017
aeb9b14
Renamed config parameter to "repair_output_ttl_seconds"
Sep 14, 2017
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
25 changes: 21 additions & 4 deletions db/repair_bucket.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,23 @@ import (

"github.com/couchbase/go-couchbase"
"github.com/couchbase/sync_gateway/base"
"time"
)

// Enum for the different repair jobs (eg, repairing rev tree cycles)
type RepairJobType string

const kDefaultRepairedFileTTL = 60 * 60 * 24 * time.Second // 24 hours

const (
RepairRevTreeCycles = RepairJobType("RepairRevTreeCycles")
)

// Params suitable for external (eg, HTTP) invocations to describe a RepairBucket operation
type RepairBucketParams struct {
DryRun bool `json:"dry_run"`
ViewQueryPageSize int `json:"view_query_page_size"`
ViewQueryPageSize *int `json:"view_query_page_size"`
RepairedFileTTL *int `json:"repair_output_ttl_seconds"`
RepairJobs []RepairJobParams `json:"repair_jobs"`
}

Expand All @@ -43,6 +47,7 @@ type DocTransformer func(docId string, originalCBDoc []byte) (transformedCBDoc [
// A RepairBucket struct is the main API entrypoint to call for repairing documents in buckets
type RepairBucket struct {
DryRun bool // If true, will only output what changes it *would* have made, but not make any changes
RepairedFileTTL time.Duration
ViewQueryPageSize int
Bucket base.Bucket
RepairJobs []DocTransformer
Expand All @@ -52,6 +57,7 @@ func NewRepairBucket(bucket base.Bucket) *RepairBucket {
return &RepairBucket{
Bucket: bucket,
ViewQueryPageSize: base.DefaultViewQueryPageSize,
RepairedFileTTL: kDefaultRepairedFileTTL,
}
}

Expand All @@ -68,7 +74,14 @@ func (r *RepairBucket) AddRepairJob(repairJob DocTransformer) *RepairBucket {
func (r *RepairBucket) InitFrom(params RepairBucketParams) *RepairBucket {

r.SetDryRun(params.DryRun)
r.ViewQueryPageSize = params.ViewQueryPageSize
if params.ViewQueryPageSize != nil && *params.ViewQueryPageSize > 0 {
r.ViewQueryPageSize = *params.ViewQueryPageSize
}

if params.RepairedFileTTL != nil && *params.RepairedFileTTL >= 0 {
r.RepairedFileTTL = time.Duration(*params.ViewQueryPageSize) * time.Second
}

for _, repairJobParams := range params.RepairJobs {
switch repairJobParams.RepairJobType {
case RepairRevTreeCycles:
Expand Down Expand Up @@ -259,9 +272,13 @@ func (r RepairBucket) WriteRepairedDocsToBucket(docId string, originalDoc, updat
return backupOrDryRunDocId, fmt.Errorf("Error unmarshalling updated/original doc. Err: %v", err)
}

expirySeconds := 60 * 60 * 24 // 24 hours
//If the RepairedFileTTL is explicitly set to 0 then don't write the doc at all
if int(r.RepairedFileTTL.Seconds()) == 0 {
base.LogTo("CRUD", "Repair Doc: Doc %v repaired, TTL set to 0, doc will not be written to bucket", backupOrDryRunDocId)
return backupOrDryRunDocId, nil
}

if err := r.Bucket.Set(backupOrDryRunDocId, expirySeconds, doc); err != nil {
if err := r.Bucket.Set(backupOrDryRunDocId, base.DurationToCbsExpiry(r.RepairedFileTTL), doc); err != nil {
return backupOrDryRunDocId, err
}

Expand Down