This commit is contained in:
Murat Kabilov 2017-09-26 13:44:30 +02:00
parent ed476ae85d
commit 19de2a24b7
1 changed files with 4 additions and 2 deletions

View File

@ -535,9 +535,11 @@ func (c *Cluster) generateMasterEndpoints(subsets []v1.EndpointSubset) *v1.Endpo
func (c *Cluster) generateCloneEnvironment(description *spec.CloneDescription) []v1.EnvVar {
result := make([]v1.EnvVar, 0)
if description.ClusterName == "" {
return result
}
cluster := description.ClusterName
result = append(result, v1.EnvVar{Name: "CLONE_SCOPE", Value: cluster})
if description.EndTimestamp == "" {
@ -563,11 +565,11 @@ func (c *Cluster) generateCloneEnvironment(description *spec.CloneDescription) [
})
} else {
// cloning with S3, find out the bucket to clone
clone_wal_s3_bucket := c.OpConfig.WALES3Bucket
result = append(result, v1.EnvVar{Name: "CLONE_METHOD", Value: "CLONE_WITH_WALE"})
result = append(result, v1.EnvVar{Name: "CLONE_WAL_S3_BUCKET", Value: clone_wal_s3_bucket})
result = append(result, v1.EnvVar{Name: "CLONE_WAL_S3_BUCKET", Value: c.OpConfig.WALES3Bucket})
result = append(result, v1.EnvVar{Name: "CLONE_TARGET_TIME", Value: description.EndTimestamp})
}
return result
}