mirror of
https://github.com/seaweedfs/seaweedfs.git
synced 2026-11-09 13:28:20 +01:00
delete in ecj, add logs
This commit is contained in:
1 parent
b2d45f1f2d
commit
5d1712e309
4 files changed
+55
-4
No files matched your search
@@ -5,6 +5,7 @@ import (
|
||||
"io"
|
||||
"os"
|
||||
|
||||
"github.com/seaweedfs/seaweedfs/weed/glog"
|
||||
"github.com/seaweedfs/seaweedfs/weed/storage/types"
|
||||
"github.com/seaweedfs/seaweedfs/weed/util"
|
||||
)
|
||||
@@ -30,20 +31,48 @@ func (ev *EcVolume) DeleteNeedleFromEcx(needleId types.NeedleId) (err error) {
|
||||
|
||||
if err != nil {
|
||||
if err == NotFoundError {
|
||||
glog.Infof("❓ EC NEEDLE NOT FOUND: needle %d not in .ecx index for volume %d generation %d - skipping .ecj recording",
|
||||
needleId, ev.VolumeId, ev.Generation)
|
||||
return nil
|
||||
}
|
||||
glog.Errorf("❌ EC INDEX SEARCH ERROR: needle %d volume %d generation %d: %v", needleId, ev.VolumeId, ev.Generation, err)
|
||||
return err
|
||||
}
|
||||
|
||||
// Needle found and marked deleted in .ecx, now record in .ecj
|
||||
glog.Infof("📝 EC NEEDLE FOUND: recording needle %d in .ecj for volume %d generation %d",
|
||||
needleId, ev.VolumeId, ev.Generation)
|
||||
|
||||
b := make([]byte, types.NeedleIdSize)
|
||||
types.NeedleIdToBytes(b, needleId)
|
||||
|
||||
ev.ecjFileAccessLock.Lock()
|
||||
defer ev.ecjFileAccessLock.Unlock()
|
||||
|
||||
ev.ecjFile.Seek(0, io.SeekEnd)
|
||||
ev.ecjFile.Write(b)
|
||||
if ev.ecjFile == nil {
|
||||
glog.Errorf("EC deletion: .ecj file is nil for volume %d generation %d", ev.VolumeId, ev.Generation)
|
||||
return fmt.Errorf("ecjFile is nil")
|
||||
}
|
||||
|
||||
ev.ecjFileAccessLock.Unlock()
|
||||
_, err = ev.ecjFile.Seek(0, io.SeekEnd)
|
||||
if err != nil {
|
||||
glog.Errorf("EC deletion: failed to seek .ecj file for volume %d generation %d: %v", ev.VolumeId, ev.Generation, err)
|
||||
return err
|
||||
}
|
||||
|
||||
n, err := ev.ecjFile.Write(b)
|
||||
if err != nil {
|
||||
glog.Errorf("EC deletion: failed to write to .ecj file for volume %d generation %d: %v", ev.VolumeId, ev.Generation, err)
|
||||
return err
|
||||
}
|
||||
|
||||
if n != len(b) {
|
||||
glog.Errorf("EC deletion: partial write to .ecj file for volume %d generation %d: wrote %d bytes, expected %d",
|
||||
ev.VolumeId, ev.Generation, n, len(b))
|
||||
return fmt.Errorf("partial write: wrote %d bytes, expected %d", n, len(b))
|
||||
}
|
||||
|
||||
glog.Infof("✅ EC JOURNAL WRITE SUCCESS: wrote %d bytes to .ecj for volume %d generation %d", n, ev.VolumeId, ev.Generation)
|
||||
|
||||
return
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user