Use uint64 in delete msg (#60)

* Use uint64 in delete msg

* Several fixes for DELETE API

cmd/client/main.go

@@ -30,8 +30,8 @@ var (
 
 	offset uint64
 
-	segmentPort int
-	segmentNum  int
+	segmentPort uint64
+	segmentNum  uint64
 	confirm     bool
 	garbage     bool
 )
@@ -367,8 +367,8 @@ func init() {
 	rootCmd.AddCommand(listCmd)
 	rootCmd.AddCommand(goolCmd)
 
-	deleteCmd.PersistentFlags().IntVarP(&segmentPort, "port", "p", 6000, "port that segment is listening on")
-	deleteCmd.PersistentFlags().IntVarP(&segmentNum, "segnum", "s", 0, "logical number of a segment")
+	deleteCmd.PersistentFlags().Uint64VarP(&segmentPort, "port", "p", 6000, "port that segment is listening on")
+	deleteCmd.PersistentFlags().Uint64VarP(&segmentNum, "segnum", "s", 0, "logical number of a segment")
 	deleteCmd.PersistentFlags().BoolVarP(&confirm, "confirm", "", false, "confirm deletion")
 	deleteCmd.PersistentFlags().BoolVarP(&garbage, "garbage", "g", false, "delete garbage")
 	rootCmd.AddCommand(deleteCmd)

pkg/backups/backups.go

@@ -16,14 +16,14 @@ type BackupLSN struct {
 
 //go:generate mockgen -destination=pkg/mock/backups.go -package=mock
 type BackupInterractor interface {
-	GetFirstLSN(int) (uint64, error)
+	GetFirstLSN(seg uint64) (uint64, error)
 }
 
 type WalgBackupInterractor struct { //TODO: rewrite to using s3 instead of wal-g cmd
 }
 
 // get lsn of the oldest backup
-func (b *WalgBackupInterractor) GetFirstLSN(seg int) (uint64, error) {
+func (b *WalgBackupInterractor) GetFirstLSN(seg uint64) (uint64, error) {
 	cmd := exec.Command("/usr/bin/wal-g", "st", "ls", fmt.Sprintf("segments_005/seg%d/basebackups_005/", seg), "--config=/etc/wal-g/wal-g.yaml")
 	ylogger.Zero.Debug().Any("flags", cmd.Args).Msg("Command args")
 	var out bytes.Buffer

pkg/database/database.go

@@ -12,7 +12,7 @@ import (
 
 //go:generate mockgen -destination=../mock/mock_database_interractor.go -package mock
 type DatabaseInterractor interface {
-	GetVirtualExpireIndexes(int) (map[string]bool, map[string]uint64, error)
+	GetVirtualExpireIndexes(port uint64) (map[string]bool, map[string]uint64, error)
 }
 
 type DatabaseHandler struct {
@@ -31,7 +31,7 @@ type Ei struct {
 	fqnmd5     string
 }
 
-func (database *DatabaseHandler) GetVirtualExpireIndexes(port int) (map[string]bool, map[string]uint64, error) { //TODO несколько баз
+func (database *DatabaseHandler) GetVirtualExpireIndexes(port uint64) (map[string]bool, map[string]uint64, error) { //TODO несколько баз
 	db, err := getDatabase(port)
 	if err != nil {
 		return nil, nil, fmt.Errorf("unable to get ao/aocs tables %v", err) //fix
@@ -95,7 +95,7 @@ func (database *DatabaseHandler) GetVirtualExpireIndexes(port int) (map[string]b
 	return c2, c, err
 }
 
-func getDatabase(port int) (DB, error) {
+func getDatabase(port uint64) (DB, error) {
 	conn, err := connectToDatabase(port, "postgres")
 	if err != nil {
 		return DB{}, err
@@ -154,7 +154,7 @@ func getDatabase(port int) (DB, error) {
 	return DB{}, fmt.Errorf("no yezzey schema across databases")
 }
 
-func connectToDatabase(port int, database string) (*pgx.Conn, error) {
+func connectToDatabase(port uint64, database string) (*pgx.Conn, error) {
 	config, err := pgx.ParseEnvLibpq()
 	if err != nil {
 		return nil, errors.Wrap(err, "Connect: unable to read environment variables")

pkg/message/delete_message.go

@@ -7,15 +7,15 @@ import (
 
 type DeleteMessage struct { //seg port
 	Name    string
-	Port    int
-	Segnum  int
+	Port    uint64
+	Segnum  uint64
 	Confirm bool
 	Garbage bool
 }
 
 var _ ProtoMessage = &DeleteMessage{}
 
-func NewDeleteMessage(name string, port int, seg int, confirm bool, garbage bool) *DeleteMessage {
+func NewDeleteMessage(name string, port uint64, seg uint64, confirm bool, garbage bool) *DeleteMessage {
 	return &DeleteMessage{
 		Name:    name,
 		Port:    port,
@@ -65,8 +65,8 @@ func (c *DeleteMessage) Decode(body []byte) {
 		c.Garbage = true
 	}
 	c.Name = c.GetDeleteName(body[4:])
-	c.Port = int(binary.BigEndian.Uint64(body[len(body)-16 : len(body)-8]))
-	c.Segnum = int(binary.BigEndian.Uint64(body[len(body)-8:]))
+	c.Port = binary.BigEndian.Uint64(body[len(body)-16 : len(body)-8])
+	c.Segnum = binary.BigEndian.Uint64(body[len(body)-8:])
 }
 
 func (c *DeleteMessage) GetDeleteName(b []byte) string {

pkg/message/message_test.go

@@ -297,8 +297,8 @@ func TestDeleteMsg(t *testing.T) {
 	msg2.Decode(body[8:])
 
 	assert.Equal("myname/mynextname", msg2.Name)
-	assert.Equal(5432, msg2.Port)
-	assert.Equal(42, msg2.Segnum)
+	assert.Equal(uint64(5432), msg2.Port)
+	assert.Equal(uint64(42), msg2.Segnum)
 	assert.True(msg2.Confirm)
 	assert.True(msg2.Garbage)
 }

pkg/proc/interaction.go

@@ -398,6 +398,8 @@ func ProcConn(s storage.StorageInteractor, cr crypt.Crypter, ycl client.YproxyCl
 			BackupInterractor:  backupHandler,
 		}
 
+		ylogger.Zero.Debug().Str("Name", msg.Name).Bool("garb", msg.Garbage).Bool("confirm", msg.Confirm).Msg("requested to remove external chunk")
+
 		if msg.Garbage {
 			err = dh.HandleDeleteGarbage(msg)
 			if err != nil {
@@ -416,10 +418,17 @@ func ProcConn(s storage.StorageInteractor, cr crypt.Crypter, ycl client.YproxyCl
 			_ = ycl.ReplyError(err, "failed to upload")
 			return err
 		}
-		ylogger.Zero.Info().Msg("Deleted garbage successfully")
-		if !msg.Confirm {
-			ylogger.Zero.Warn().Msg("It was a dry-run, nothing was deleted")
+
+		if msg.Garbage {
+			if !msg.Confirm {
+				ylogger.Zero.Warn().Msg("It was a dry-run, nothing was deleted")
+			} else {
+				ylogger.Zero.Info().Msg("Deleted garbage successfully")
+			}
+		} else {
+			ylogger.Zero.Info().Msg("Deleted chunk successfully")
 		}
+
 	case message.MessageTypeGool:
 		return ProcMotion(s, cr, ycl)
 

pkg/storage/s3storage.go

@@ -181,6 +181,6 @@ func (s *S3StorageInteractor) DeleteObject(key string) error {
 		ylogger.Zero.Err(err).Msg("failed to delete old object")
 		return err
 	}
-	ylogger.Zero.Debug().Msg("deleted object")
+	ylogger.Zero.Debug().Str("path", key).Msg("deleted object")
 	return nil
 }