rename import-server to tikv-importer (pingcap#32)

lightning/config/config.go

@@ -31,7 +31,7 @@ type Config struct {
 	ProgressStore DBStore `toml:"progress-store"`
 
 	Mydumper     MydumperRuntime `toml:"mydumper"`
-	ImportServer ImportServer    `toml:"import-server"`
+	TikvImporter TikvImporter    `toml:"tikv-importer"`
 	PostRestore  PostRestore     `toml:"post-restore"`
 
 	// command line flags
@@ -58,7 +58,7 @@ type MydumperRuntime struct {
 	SourceDir     string `toml:"data-source-dir"`
 }
 
-type ImportServer struct {
+type TikvImporter struct {
 	Addr      string `toml:"addr"`
 	BatchSize int64  `toml:"batch-size"`
 }
@@ -105,8 +105,8 @@ func LoadConfig(args []string) (*Config, error) {
 	}
 
 	// hendle kv import
-	if cfg.ImportServer.BatchSize <= 0 {
-		cfg.ImportServer.BatchSize = KVMaxBatchSize
+	if cfg.TikvImporter.BatchSize <= 0 {
+		cfg.TikvImporter.BatchSize = KVMaxBatchSize
 	}
 
 	return cfg, nil

lightning/lightning.go

@@ -32,7 +32,7 @@ func initEnv(cfg *config.Config) error {
 		return errors.Trace(err)
 	}
 
-	kv.ConfigDeliverTxnBatchSize(cfg.ImportServer.BatchSize)
+	kv.ConfigDeliverTxnBatchSize(cfg.TikvImporter.BatchSize)
 
 	if cfg.App.ProfilePort > 0 {
 		go func() { // TODO : config to enable it in debug mode
@@ -91,7 +91,7 @@ func (l *Lightning) run() {
 }
 
 func (l *Lightning) doCompact() error {
-	cli, err := kv.NewKVDeliverClient(context.Background(), uuid.Nil, l.cfg.ImportServer.Addr, l.cfg.TiDB.PdAddr)
+	cli, err := kv.NewKVDeliverClient(context.Background(), uuid.Nil, l.cfg.TikvImporter.Addr, l.cfg.TiDB.PdAddr)
 	if err != nil {
 		return errors.Trace(err)
 	}

lightning/restore/restore.go

@@ -208,7 +208,7 @@ func (rc *RestoreControlloer) compact(ctx context.Context) error {
 		return nil
 	}
 
-	cli, err := kv.NewKVDeliverClient(ctx, uuid.Nil, rc.cfg.ImportServer.Addr, rc.cfg.TiDB.PdAddr)
+	cli, err := kv.NewKVDeliverClient(ctx, uuid.Nil, rc.cfg.TikvImporter.Addr, rc.cfg.TiDB.PdAddr)
 	if err != nil {
 		return errors.Trace(err)
 	}
@@ -323,7 +323,7 @@ func makeKVDeliver(
 	tableInfo *TidbTableInfo) (kv.KVDeliver, error) {
 
 	uuid := uuid.Must(uuid.NewV4())
-	return kv.NewKVDeliverClient(ctx, uuid, cfg.ImportServer.Addr, cfg.TiDB.PdAddr)
+	return kv.NewKVDeliverClient(ctx, uuid, cfg.TikvImporter.Addr, cfg.TiDB.PdAddr)
 }
 
 func setSessionVarInt(db *sql.DB, name string, value int) {
@@ -564,7 +564,7 @@ func NewTableRestore(
 		tableInfo:      tableInfo,
 		tableMeta:      tableMeta,
 		encoders:       encoders,
-		deliversMgr:    kv.NewKVDeliverKeeper(cfg.ImportServer.Addr, cfg.TiDB.PdAddr),
+		deliversMgr:    kv.NewKVDeliverKeeper(cfg.TikvImporter.Addr, cfg.TiDB.PdAddr),
 		handledRegions: make(map[int]*regionStat),
 		localChecksums: localChecksums,
 	}
@@ -853,7 +853,10 @@ func (exc *RegionRestoreExectuor) Run(
 			3. load kvs data (into kv deliver server)
 			4. flush kvs data (into tikv node)
 	*/
-	reader, _ := mydump.NewRegionReader(region.File, region.Offset, region.Size)
+	reader, err := mydump.NewRegionReader(region.File, region.Offset, region.Size)
+	if err != nil {
+		return 0, 0, nil, errors.Trace(err)
+	}
 	defer reader.Close()
 
 	table := exc.tableInfo.Name
@@ -866,8 +869,8 @@ func (exc *RegionRestoreExectuor) Run(
 	/*
 		TODO :
 			So far, since checksum can not recompute on the same key-value pair,
-			otherwise this would leds to an incorrect checksum value finally.
-			So it's important to gaurnate that do checksum on kvs correctly
+			otherwise this would leads to an incorrect checksum value finally.
+			So it's important to guarantee that do checksum on kvs correctly
 			no matter what happens during process of restore ( eg. safe point / error retry ... )
 	*/
 

tidb-lightning.toml

@@ -14,7 +14,7 @@ max-size = 128 # MB
 max-days = 28
 max-backups = 14
 
-[import-server]
+[tikv-importer]
 addr = "127.0.0.1:8808"
 # size of batch to import kv data into TiKV: xxx (GB)
 batch-size = 200 # GB