package main
import (
- "bytes"
+ "bufio"
"errors"
"flag"
+ "fmt"
"git.curoverse.com/arvados.git/sdk/go/arvadosclient"
"git.curoverse.com/arvados.git/sdk/go/keepclient"
"io/ioutil"
// keep-rsync arguments
var (
- srcConfig arvadosclient.APIConfig
- dstConfig arvadosclient.APIConfig
- blobSigningKey string
- srcKeepServicesJSON string
- dstKeepServicesJSON string
- replications int
- prefix string
+ blobSigningKey string
)
-var srcConfigFile string
-var dstConfigFile string
-
func main() {
+ var srcConfigFile, dstConfigFile, srcKeepServicesJSON, dstKeepServicesJSON, prefix string
+ var replications int
+
flag.StringVar(
&srcConfigFile,
"src-config-file",
flag.Parse()
- var err error
-
- err = loadConfig()
+ srcConfig, dstConfig, err := loadConfig(srcConfigFile, dstConfigFile)
if err != nil {
- log.Fatal("Error loading configuration from files: %s", err.Error())
+ log.Fatalf("Error loading configuration from files: %s", err.Error())
}
- // Initialize keep-rsync
- err = initializeKeepRsync()
+ // setup src and dst keepclients
+ kcSrc, kcDst, err := setupKeepClients(srcConfig, dstConfig, srcKeepServicesJSON, dstKeepServicesJSON, replications)
if err != nil {
- log.Fatal("Error configuring keep-rsync: %s", err.Error())
+ log.Fatalf("Error configuring keep-rsync: %s", err.Error())
}
// Copy blocks not found in dst from src
- err = performKeepRsync()
+ err = performKeepRsync(kcSrc, kcDst, prefix)
if err != nil {
- log.Fatal("Error while syncing data: %s", err.Error())
+ log.Fatalf("Error while syncing data: %s", err.Error())
}
}
// Load src and dst config from given files
-func loadConfig() error {
+func loadConfig(srcConfigFile, dstConfigFile string) (srcConfig, dstConfig arvadosclient.APIConfig, err error) {
if srcConfigFile == "" {
- return errors.New("-src-config-file must be specified")
+ return srcConfig, dstConfig, errors.New("-src-config-file must be specified")
}
- var err error
-
srcConfig, err = readConfigFromFile(srcConfigFile)
if err != nil {
- log.Printf("Error reading source configuration: %s", err.Error())
- return err
+ return srcConfig, dstConfig, fmt.Errorf("Error reading source configuration: %v", err)
}
if dstConfigFile == "" {
- return errors.New("-dst-config-file must be specified")
+ return srcConfig, dstConfig, errors.New("-dst-config-file must be specified")
}
dstConfig, err = readConfigFromFile(dstConfigFile)
if err != nil {
- log.Printf("Error reading destination configuration: %s", err.Error())
+ return srcConfig, dstConfig, fmt.Errorf("Error reading destination configuration: %v", err)
}
- return err
+ return srcConfig, dstConfig, err
}
var matchTrue = regexp.MustCompile("^(?i:1|yes|true)$")
-// Reads config from file
+// Read config from file
func readConfigFromFile(filename string) (arvadosclient.APIConfig, error) {
var config arvadosclient.APIConfig
if line == "" {
continue
}
- kv := strings.Split(line, "=")
- switch kv[0] {
+ kv := strings.SplitN(line, "=", 2)
+ key := strings.TrimSpace(kv[0])
+ value := strings.TrimSpace(kv[1])
+
+ switch key {
case "ARVADOS_API_TOKEN":
- config.APIToken = kv[1]
+ config.APIToken = value
case "ARVADOS_API_HOST":
- config.APIHost = kv[1]
+ config.APIHost = value
case "ARVADOS_API_HOST_INSECURE":
- config.APIHostInsecure = matchTrue.MatchString(kv[1])
+ config.APIHostInsecure = matchTrue.MatchString(value)
case "ARVADOS_EXTERNAL_CLIENT":
- config.ExternalClient = matchTrue.MatchString(kv[1])
+ config.ExternalClient = matchTrue.MatchString(value)
case "ARVADOS_BLOB_SIGNING_KEY":
- blobSigningKey = kv[1]
+ blobSigningKey = value
}
}
return config, nil
}
-// keep-rsync source and destination clients
-var (
- arvSrc arvadosclient.ArvadosClient
- arvDst arvadosclient.ArvadosClient
- kcSrc *keepclient.KeepClient
- kcDst *keepclient.KeepClient
-)
-
// Initializes keep-rsync using the config provided
-func initializeKeepRsync() (err error) {
+func setupKeepClients(srcConfig, dstConfig arvadosclient.APIConfig, srcKeepServicesJSON, dstKeepServicesJSON string, replications int) (kcSrc, kcDst *keepclient.KeepClient, err error) {
// arvSrc from srcConfig
- arvSrc, err = arvadosclient.New(srcConfig)
+ arvSrc, err := arvadosclient.New(srcConfig)
if err != nil {
- return
+ return kcSrc, kcDst, err
}
// arvDst from dstConfig
- arvDst, err = arvadosclient.New(dstConfig)
+ arvDst, err := arvadosclient.New(dstConfig)
if err != nil {
- return
+ return kcSrc, kcDst, err
}
// Get default replications value from destination, if it is not already provided
if srcKeepServicesJSON == "" {
kcSrc, err = keepclient.MakeKeepClient(&arvSrc)
if err != nil {
- return
+ return nil, nil, err
}
} else {
kcSrc, err = keepclient.MakeKeepClientFromJSON(&arvSrc, srcKeepServicesJSON)
if err != nil {
- return
+ return kcSrc, kcDst, err
}
}
if dstKeepServicesJSON == "" {
kcDst, err = keepclient.MakeKeepClient(&arvDst)
if err != nil {
- return
+ return kcSrc, kcDst, err
}
} else {
kcDst, err = keepclient.MakeKeepClientFromJSON(&arvDst, dstKeepServicesJSON)
if err != nil {
- return
+ return kcSrc, kcDst, err
}
}
kcDst.Want_replicas = replications
- return
+ return kcSrc, kcDst, nil
}
// Get unique block locators from src and dst
// Copy any blocks missing in dst
-func performKeepRsync() error {
+func performKeepRsync(kcSrc, kcDst *keepclient.KeepClient, prefix string) error {
// Get unique locators from src
srcIndex, err := getUniqueLocators(kcSrc, prefix)
if err != nil {
toBeCopied := getMissingLocators(srcIndex, dstIndex)
// Copy each missing block to dst
- err = copyBlocksToDst(toBeCopied)
+ err = copyBlocksToDst(toBeCopied, kcSrc, kcDst)
return err
}
// Get list of unique locators from the specified cluster
-func getUniqueLocators(kc *keepclient.KeepClient, indexPrefix string) (map[string]bool, error) {
- var indexBytes []byte
+func getUniqueLocators(kc *keepclient.KeepClient, prefix string) (map[string]bool, error) {
+ uniqueLocators := map[string]bool{}
+ // Get index and dedup
for uuid := range kc.LocalRoots() {
- reader, err := kc.GetIndex(uuid, indexPrefix)
+ reader, err := kc.GetIndex(uuid, prefix)
if err != nil {
- return nil, err
+ return uniqueLocators, err
}
-
- var readBytes []byte
- readBytes, err = ioutil.ReadAll(reader)
- if err != nil {
- return nil, err
+ scanner := bufio.NewScanner(reader)
+ for scanner.Scan() {
+ uniqueLocators[strings.Split(scanner.Text(), " ")[0]] = true
}
-
- indexBytes = append(indexBytes, readBytes...)
}
- // Got index; Now dedup it
- locators := bytes.Split(indexBytes, []byte("\n"))
-
- uniqueLocators := map[string]bool{}
- for _, loc := range locators {
- if len(loc) == 0 {
- continue
- }
-
- locator := string(bytes.Split(loc, []byte(" "))[0])
- if _, ok := uniqueLocators[locator]; !ok {
- uniqueLocators[locator] = true
- }
- }
return uniqueLocators, nil
}
// Get list of locators that are in src but not in dst
-func getMissingLocators(srcLocators map[string]bool, dstLocators map[string]bool) []string {
+func getMissingLocators(srcLocators, dstLocators map[string]bool) []string {
var missingLocators []string
for locator := range srcLocators {
if _, ok := dstLocators[locator]; !ok {
}
// Copy blocks from src to dst; only those that are missing in dst are copied
-func copyBlocksToDst(toBeCopied []string) error {
+func copyBlocksToDst(toBeCopied []string, kcSrc, kcDst *keepclient.KeepClient) error {
done := 0
total := len(toBeCopied)
for _, locator := range toBeCopied {
- log.Printf("Getting block %d of %d", done+1, total)
-
- log.Printf("Getting block: %v", locator)
+ log.Printf("Getting block %d of %d: %v", done+1, total, locator)
getLocator := locator
expiresAt := time.Now().AddDate(0, 0, 1)
if blobSigningKey != "" {
- getLocator = keepclient.SignLocator(getLocator, arvSrc.ApiToken, expiresAt, []byte(blobSigningKey))
+ getLocator = keepclient.SignLocator(getLocator, kcSrc.Arvados.ApiToken, expiresAt, []byte(blobSigningKey))
}
reader, _, _, err := kcSrc.Get(getLocator)
if err != nil {
- log.Printf("Error getting block: %q %v", locator, err)
- return err
+ return fmt.Errorf("Error getting block: %v %v", locator, err)
}
data, err := ioutil.ReadAll(reader)
if err != nil {
- log.Printf("Error reading block data: %q %v", locator, err)
- return err
+ return fmt.Errorf("Error reading block data: %v %v", locator, err)
}
- log.Printf("Copying block: %q", locator)
+ log.Printf("Writing block%d of %d: %v", locator)
_, _, err = kcDst.PutB(data)
if err != nil {
- log.Printf("Error putting block data: %q %v", locator, err)
- return err
+ return fmt.Errorf("Error putting block data: %v %v", locator, err)
}
done++
arvadostest.ResetEnv()
// reset all variables between tests
- srcConfig = arvadosclient.APIConfig{}
- dstConfig = arvadosclient.APIConfig{}
blobSigningKey = ""
srcKeepServicesJSON = ""
dstKeepServicesJSON = ""
- replications = 0
- prefix = ""
- srcConfigFile = ""
- dstConfigFile = ""
- arvSrc = arvadosclient.ArvadosClient{}
- arvDst = arvadosclient.ArvadosClient{}
kcSrc = &keepclient.KeepClient{}
kcDst = &keepclient.KeepClient{}
}
arvadostest.StopAPI()
}
+var kcSrc *keepclient.KeepClient
+var kcDst *keepclient.KeepClient
+var srcKeepServicesJSON string
+var dstKeepServicesJSON string
+
var testKeepServicesJSON = "{ \"kind\":\"arvados#keepServiceList\", \"etag\":\"\", \"self_link\":\"\", \"offset\":null, \"limit\":null, \"items\":[ { \"href\":\"/keep_services/zzzzz-bi6l4-123456789012340\", \"kind\":\"arvados#keepService\", \"etag\":\"641234567890enhj7hzx432e5\", \"uuid\":\"zzzzz-bi6l4-123456789012340\", \"owner_uuid\":\"zzzzz-tpzed-123456789012345\", \"service_host\":\"keep0.zzzzz.arvadosapi.com\", \"service_port\":25107, \"service_ssl_flag\":false, \"service_type\":\"disk\", \"read_only\":false }, { \"href\":\"/keep_services/zzzzz-bi6l4-123456789012341\", \"kind\":\"arvados#keepService\", \"etag\":\"641234567890enhj7hzx432e5\", \"uuid\":\"zzzzz-bi6l4-123456789012341\", \"owner_uuid\":\"zzzzz-tpzed-123456789012345\", \"service_host\":\"keep0.zzzzz.arvadosapi.com\", \"service_port\":25108, \"service_ssl_flag\":false, \"service_type\":\"disk\", \"read_only\":false } ], \"items_available\":2 }"
// Testing keep-rsync needs two sets of keep services: src and dst.
// The test setup hence tweaks keep-rsync initialization to achieve this.
-// First invoke initializeKeepRsync and then invoke StartKeepWithParams
+// First invoke setupKeepClients and then invoke StartKeepWithParams
// to create the keep servers to be used as destination.
-func setupRsync(c *C, enforcePermissions bool, setupDstServers bool) {
+func setupRsync(c *C, enforcePermissions, setupDstServers bool, replications int) {
// srcConfig
+ var srcConfig arvadosclient.APIConfig
srcConfig.APIHost = os.Getenv("ARVADOS_API_HOST")
srcConfig.APIToken = os.Getenv("ARVADOS_API_TOKEN")
srcConfig.APIHostInsecure = matchTrue.MatchString(os.Getenv("ARVADOS_API_HOST_INSECURE"))
// dstConfig
+ var dstConfig arvadosclient.APIConfig
dstConfig.APIHost = os.Getenv("ARVADOS_API_HOST")
dstConfig.APIToken = os.Getenv("ARVADOS_API_TOKEN")
dstConfig.APIHostInsecure = matchTrue.MatchString(os.Getenv("ARVADOS_API_HOST_INSECURE"))
arvadostest.StartAPI()
arvadostest.StartKeepWithParams(false, enforcePermissions)
- // initialize keep-rsync
- err := initializeKeepRsync()
+ // setup keepclients
+ var err error
+ kcSrc, kcDst, err = setupKeepClients(srcConfig, dstConfig, srcKeepServicesJSON, dstKeepServicesJSON, replications)
c.Check(err, IsNil)
// Create an additional keep server to be used as destination and reload kcDst
- // Set replications to 1 since those many keep servers were created for dst.
if setupDstServers {
arvadostest.StartKeepWithParams(true, enforcePermissions)
- replications = 1
-
- kcDst, err = keepclient.MakeKeepClient(&arvDst)
+ kcDst, err = keepclient.MakeKeepClient(kcDst.Arvados)
c.Check(err, IsNil)
- kcDst.Want_replicas = 1
+ kcDst.Want_replicas = replications
}
}
// Do a Get in dst for the src hash, which should raise block not found error.
// Do a Get in src for the dst hash, which should raise block not found error.
func (s *ServerRequiredSuite) TestRsyncPutInOne_GetFromOtherShouldFail(c *C) {
- setupRsync(c, false, true)
+ setupRsync(c, false, true, 1)
// Put a block in src using kcSrc and Get it
srcData := []byte("test-data1")
func (s *ServerRequiredSuite) TestRsyncInitializeWithKeepServicesJSON(c *C) {
srcKeepServicesJSON = testKeepServicesJSON
- setupRsync(c, false, true)
+ setupRsync(c, false, true, 1)
localRoots := kcSrc.LocalRoots()
- c.Check(localRoots != nil, Equals, true)
+ c.Check(localRoots, NotNil)
foundIt := false
for k := range localRoots {
// Do a Get in dst for the src hash, which should raise block not found error.
// Do a Get in src for the dst hash, which should raise block not found error.
func (s *ServerRequiredSuite) TestRsyncWithBlobSigning_PutInOne_GetFromOtherShouldFail(c *C) {
- setupRsync(c, true, true)
+ setupRsync(c, true, true, 1)
// Put a block in src using kcSrc and Get it
srcData := []byte("test-data1")
c.Check(err, Equals, nil)
tomorrow := time.Now().AddDate(0, 0, 1)
- signedLocator := keepclient.SignLocator(locatorInSrc, arvSrc.ApiToken, tomorrow, []byte(blobSigningKey))
+ signedLocator := keepclient.SignLocator(locatorInSrc, kcSrc.Arvados.ApiToken, tomorrow, []byte(blobSigningKey))
reader, blocklen, _, err := kcSrc.Get(signedLocator)
c.Check(err, IsNil)
c.Check(rep, Equals, 1)
c.Check(err, Equals, nil)
- signedLocator = keepclient.SignLocator(locatorInDst, arvDst.ApiToken, tomorrow, []byte(blobSigningKey))
+ signedLocator = keepclient.SignLocator(locatorInDst, kcDst.Arvados.ApiToken, tomorrow, []byte(blobSigningKey))
reader, blocklen, _, err = kcDst.Get(signedLocator)
c.Check(err, IsNil)
c.Check(all, DeepEquals, dstData)
// Get srcLocator using kcDst should fail with Not Found error
- signedLocator = keepclient.SignLocator(locatorInSrc, arvDst.ApiToken, tomorrow, []byte(blobSigningKey))
+ signedLocator = keepclient.SignLocator(locatorInSrc, kcDst.Arvados.ApiToken, tomorrow, []byte(blobSigningKey))
_, _, _, err = kcDst.Get(locatorInSrc)
c.Assert(err.Error(), Equals, "Block not found")
// Get dstLocator using kcSrc should fail with Not Found error
- signedLocator = keepclient.SignLocator(locatorInDst, arvSrc.ApiToken, tomorrow, []byte(blobSigningKey))
+ signedLocator = keepclient.SignLocator(locatorInDst, kcSrc.Arvados.ApiToken, tomorrow, []byte(blobSigningKey))
_, _, _, err = kcSrc.Get(locatorInDst)
c.Assert(err.Error(), Equals, "Block not found")
}
// Test keep-rsync initialization with default replications count
func (s *ServerRequiredSuite) TestInitializeRsyncDefaultReplicationsCount(c *C) {
- setupRsync(c, false, false)
+ setupRsync(c, false, false, 0)
// Must have got default replications value as 2 from dst discovery document
- c.Assert(replications, Equals, 2)
+ c.Assert(kcDst.Want_replicas, Equals, 2)
}
// Test keep-rsync initialization with replications count argument
func (s *ServerRequiredSuite) TestInitializeRsyncReplicationsCount(c *C) {
- // First set replications to 3 to mimic passing input argument
- replications = 3
-
- setupRsync(c, false, false)
+ setupRsync(c, false, false, 3)
// Since replications value is provided, default is not used
- c.Assert(replications, Equals, 3)
+ c.Assert(kcDst.Want_replicas, Equals, 3)
}
// Put some blocks in Src and some more in Dst
// Hence there are 3 additional blocks in src
// Also, put 2 extra blocks in dst; they are hence only in dst
// Run rsync and verify that those 7 blocks are now available in dst
-func testKeepRsync(c *C, enforcePermissions bool, indexPrefix string) {
- setupRsync(c, enforcePermissions, true)
-
- prefix = indexPrefix
+func testKeepRsync(c *C, enforcePermissions bool, prefix string) {
+ setupRsync(c, enforcePermissions, true, 1)
// setupTestData
setupTestData(c, enforcePermissions, prefix)
- err := performKeepRsync()
+ err := performKeepRsync(kcSrc, kcDst, prefix)
c.Check(err, IsNil)
// Now GetIndex from dst and verify that all 5 from src and the 2 extra blocks are found
}
// Setup test data in src and dst.
-var srcLocators []string
-var srcLocatorsMatchingPrefix []string
-var dstLocators []string
-var extraDstLocators []string
-
+var srcLocators, srcLocatorsMatchingPrefix, dstLocators, extraDstLocators []string
func setupTestData(c *C, enforcePermissions bool, indexPrefix string) {
srcLocators = []string{}
srcLocatorsMatchingPrefix = []string{}
dstLocators = []string{}
extraDstLocators = []string{}
- tomorrow := time.Now().AddDate(0, 0, 1)
-
// Put a few blocks in src using kcSrc
for i := 0; i < 5; i++ {
- data := []byte(fmt.Sprintf("test-data-%d", i))
- hash := fmt.Sprintf("%x", md5.Sum(data))
-
- hash2, rep, err := kcSrc.PutB(data)
- c.Check(hash2, Matches, fmt.Sprintf(`^%s\+11(\+.+)?$`, hash))
- c.Check(rep, Equals, 2)
+ hash, _, err := kcSrc.PutB([]byte(fmt.Sprintf("test-data-%d", i)))
c.Check(err, IsNil)
- getLocator := hash
- if enforcePermissions {
- getLocator = keepclient.SignLocator(getLocator, arvSrc.ApiToken, tomorrow, []byte(blobSigningKey))
- }
-
- reader, blocklen, _, err := kcSrc.Get(getLocator)
- c.Check(err, IsNil)
- c.Check(blocklen, Equals, int64(11))
- all, err := ioutil.ReadAll(reader)
- c.Check(all, DeepEquals, data)
-
- srcLocators = append(srcLocators, fmt.Sprintf("%s+%d", hash, blocklen))
+ srcLocators = append(srcLocators, strings.Split(hash, "+A")[0])
if strings.HasPrefix(hash, indexPrefix) {
- srcLocatorsMatchingPrefix = append(srcLocatorsMatchingPrefix, fmt.Sprintf("%s+%d", hash, blocklen))
+ srcLocatorsMatchingPrefix = append(srcLocatorsMatchingPrefix, strings.Split(hash, "+A")[0])
}
}
// Put first two of those src blocks in dst using kcDst
for i := 0; i < 2; i++ {
- data := []byte(fmt.Sprintf("test-data-%d", i))
- hash := fmt.Sprintf("%x", md5.Sum(data))
-
- hash2, rep, err := kcDst.PutB(data)
- c.Check(hash2, Matches, fmt.Sprintf(`^%s\+11(\+.+)?$`, hash))
- c.Check(rep, Equals, 1)
- c.Check(err, IsNil)
-
- getLocator := hash
- if enforcePermissions {
- getLocator = keepclient.SignLocator(getLocator, arvDst.ApiToken, tomorrow, []byte(blobSigningKey))
- }
-
- reader, blocklen, _, err := kcDst.Get(getLocator)
+ hash, _, err := kcDst.PutB([]byte(fmt.Sprintf("test-data-%d", i)))
c.Check(err, IsNil)
- c.Check(blocklen, Equals, int64(11))
- all, err := ioutil.ReadAll(reader)
- c.Check(all, DeepEquals, data)
-
- dstLocators = append(dstLocators, fmt.Sprintf("%s+%d", hash, blocklen))
+ dstLocators = append(dstLocators, strings.Split(hash, "+A")[0])
}
// Put two more blocks in dst; they are not in src at all
for i := 0; i < 2; i++ {
- data := []byte(fmt.Sprintf("other-data-%d", i))
- hash := fmt.Sprintf("%x", md5.Sum(data))
-
- hash2, rep, err := kcDst.PutB(data)
- c.Check(hash2, Matches, fmt.Sprintf(`^%s\+12(\+.+)?$`, hash))
- c.Check(rep, Equals, 1)
- c.Check(err, IsNil)
-
- getLocator := hash
- if enforcePermissions {
- getLocator = keepclient.SignLocator(getLocator, arvDst.ApiToken, tomorrow, []byte(blobSigningKey))
- }
-
- reader, blocklen, _, err := kcDst.Get(getLocator)
+ hash, _, err := kcDst.PutB([]byte(fmt.Sprintf("other-data-%d", i)))
c.Check(err, IsNil)
- c.Check(blocklen, Equals, int64(12))
- all, err := ioutil.ReadAll(reader)
- c.Check(all, DeepEquals, data)
-
- extraDstLocators = append(extraDstLocators, fmt.Sprintf("%s+%d", hash, blocklen))
+ dstLocators = append(dstLocators, strings.Split(hash, "+A")[0])
+ extraDstLocators = append(extraDstLocators, strings.Split(hash, "+A")[0])
}
}
func (s *ServerRequiredSuite) TestErrorDuringRsync_FakeSrcKeepservers(c *C) {
srcKeepServicesJSON = testKeepServicesJSON
- setupRsync(c, false, false)
+ setupRsync(c, false, false, 1)
- err := performKeepRsync()
+ err := performKeepRsync(kcSrc, kcDst, "")
c.Check(strings.HasSuffix(err.Error(), "no such host"), Equals, true)
}
func (s *ServerRequiredSuite) TestErrorDuringRsync_FakeDstKeepservers(c *C) {
dstKeepServicesJSON = testKeepServicesJSON
- setupRsync(c, false, false)
+ setupRsync(c, false, false, 1)
- err := performKeepRsync()
+ err := performKeepRsync(kcSrc, kcDst, "")
c.Check(strings.HasSuffix(err.Error(), "no such host"), Equals, true)
}
// Test rsync with signature error during Get from src.
func (s *ServerRequiredSuite) TestErrorDuringRsync_ErrorGettingBlockFromSrc(c *C) {
- setupRsync(c, true, true)
+ setupRsync(c, true, true, 1)
// put some blocks in src and dst
setupTestData(c, true, "")
// Change blob signing key to a fake key, so that Get from src fails
blobSigningKey = "123456789012345678901234yhksjoll2grmku38mi7yxd66h5j4q9w4jzanezacp8s6q0ro3hxakfye02152hncy6zml2ed0uc"
- err := performKeepRsync()
- c.Check(err.Error(), Equals, "Block not found")
+ err := performKeepRsync(kcSrc, kcDst, "")
+ c.Check(strings.HasSuffix(err.Error(), "Block not found"), Equals, true)
}
// Test rsync with error during Put to src.
func (s *ServerRequiredSuite) TestErrorDuringRsync_ErrorPuttingBlockInDst(c *C) {
- setupRsync(c, false, true)
+ setupRsync(c, false, true, 1)
// put some blocks in src and dst
setupTestData(c, true, "")
// Increase Want_replicas on dst to result in insufficient replicas error during Put
kcDst.Want_replicas = 2
- err := performKeepRsync()
- c.Check(err.Error(), Equals, "Could not write sufficient replicas")
+ err := performKeepRsync(kcSrc, kcDst, "")
+ c.Check(strings.HasSuffix(err.Error(), "Could not write sufficient replicas"), Equals, true)
}
// Test loadConfig func
// Setup a src config file
srcFile := setupConfigFile(c, "src-config")
defer os.Remove(srcFile.Name())
- srcConfigFile = srcFile.Name()
+ srcConfigFile := srcFile.Name()
// Setup a dst config file
dstFile := setupConfigFile(c, "dst-config")
defer os.Remove(dstFile.Name())
- dstConfigFile = dstFile.Name()
+ dstConfigFile := dstFile.Name()
// load configuration from those files
- err := loadConfig()
+ srcConfig, dstConfig, err := loadConfig(srcConfigFile, dstConfigFile)
c.Check(err, IsNil)
c.Assert(srcConfig.APIHost, Equals, "testhost")
// Test loadConfig func without setting up the config files
func (s *ServerRequiredSuite) TestLoadConfig_MissingSrcConfig(c *C) {
- srcConfigFile = ""
- err := loadConfig()
+ _, _, err := loadConfig("", "")
c.Assert(err.Error(), Equals, "-src-config-file must be specified")
}
// Test loadConfig func - error reading src config
func (s *ServerRequiredSuite) TestLoadConfig_ErrorLoadingSrcConfig(c *C) {
- srcConfigFile = "no-such-config-file"
-
- // load configuration
- err := loadConfig()
+ _, _, err := loadConfig("no-such-config-file", "")
c.Assert(strings.HasSuffix(err.Error(), "no such file or directory"), Equals, true)
}
// Setup a src config file
srcFile := setupConfigFile(c, "src-config")
defer os.Remove(srcFile.Name())
- srcConfigFile = srcFile.Name()
-
- // But do not setup the dst config file
- dstConfigFile = ""
+ srcConfigFile := srcFile.Name()
// load configuration
- err := loadConfig()
+ _, _, err := loadConfig(srcConfigFile, "")
c.Assert(err.Error(), Equals, "-dst-config-file must be specified")
}
// Setup a src config file
srcFile := setupConfigFile(c, "src-config")
defer os.Remove(srcFile.Name())
- srcConfigFile = srcFile.Name()
-
- // But do not setup the dst config file
- dstConfigFile = "no-such-config-file"
+ srcConfigFile := srcFile.Name()
// load configuration
- err := loadConfig()
+ _, _, err := loadConfig(srcConfigFile, "no-such-config-file")
c.Assert(strings.HasSuffix(err.Error(), "no such file or directory"), Equals, true)
}
projects / arvados.git / commitdiff