mirror/ternfs-XTXMarkets
1
0
Fork 0
mirror of https://github.com/XTXMarkets/ternfs.git synced 2026-05-06 20:31:17 -05:00
Code Issues Packages Projects Releases Wiki Activity

Apply gofmt to everything

Browse Source 
Sadly this has drifted over time.
This commit is contained in:
Joshua Leahy
2026-03-17 10:04:01 +00:00
parent 97fb46013a
commit 950c76f264
17 changed files with 61 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
go/cleanup/migrate.go
+3 -3
View File
@@ -599,9 +599,9 @@ type migrator struct {
fileMigratorsNewFile chan msgs.InodeId
statsC chan MigrateStats
stopC chan bool
logOnly bool
failureDomainFilter string
locationId msgs.Location
logOnly bool
failureDomainFilter string
locationId msgs.Location
}
func Migrator(registryAddress string, log *log.Logger, client *client.Client, numMigrators uint64, migratorIdx uint64, numParallelFiles uint32, logOnly bool, failureDomain string, locationId msgs.Location) *migrator {
go/cleanup/policy.go
+1 -1
View File
@@ -124,7 +124,7 @@ func edgesToRemove(dir msgs.InodeId, policy *msgs.SnapshotPolicy, now msgs.TernT
firstGoodEdge = 0
}
// remove trailing delete edges
for firstGoodEdge < len(edges) && edges[firstGoodEdge].TargetId.Id() == msgs.NULL_INODE_ID {
for firstGoodEdge < len(edges) && edges[firstGoodEdge].TargetId.Id() == msgs.NULL_INODE_ID {
firstGoodEdge++
}
return firstGoodEdge
go/cleanup/policy_test.go
-1
View File
@@ -167,4 +167,3 @@ func TestDeleteOrphanDelete(t *testing.T) {
}
assert.Equal(t, 1, edgesToRemove(msgs.NULL_INODE_ID, &msgs.SnapshotPolicy{DeleteAfterTime: msgs.ActiveDeleteAfterTime(time.Hour)}, date(5), edges, time.Duration(0)))
}
go/client/client.go
+2 -3
View File
@@ -961,7 +961,7 @@ type Client struct {
registryAddress string
addrsRefreshClose chan (struct{})
registryConn *RegistryConn
clientReady atomic.Bool
clientReady atomic.Bool
fetchBlockServices bool
blockServicesLock *sync.RWMutex
@@ -1004,7 +1004,6 @@ func (c *Client) refreshAddrs() error {
c.SetAddrs(cdcAddrs, &shardAddrs)
}
fetchBlockServices := func() bool {
c.blockServicesLock.RLock()
defer c.blockServicesLock.RUnlock()
@@ -1071,7 +1070,7 @@ func NewClient(
if err := c.refreshAddrs(); err != nil {
log.RaiseNC(addressRefreshAlert, "%v", err)
if !wasReady {
addrsRefreshTicker.Reset(10*time.Second)
addrsRefreshTicker.Reset(10 * time.Second)
}
} else {
if !wasReady {
go/client/metadatareq.go
+1 -1
View File
@@ -79,7 +79,7 @@ func (c *Client) metadataRequest(
var isTernError bool
ternError, isTernError = resp.err.(msgs.TernError)
shouldCheckIdempotency := attempts > 0
if (shid >=0) {
if shid >= 0 {
if reqBody.(msgs.ShardRequest).ShardRequestKind() == msgs.SAME_DIRECTORY_RENAME {
shouldCheckIdempotency = true
}
go/client/registryreq.go
+4 -4
View File
@@ -183,11 +183,11 @@ type shuckReq struct {
}
type RegistryConn struct {
log *log.Logger
timeout RegistryTimeouts
log *log.Logger
timeout RegistryTimeouts
registryAddress string
reqChan chan shuckReq
numHandlers uint
reqChan chan shuckReq
numHandlers uint
}
func MakeRegistryConn(
go/client/shardreq.go
+3 -3
View File
@@ -63,9 +63,9 @@ func (c *Client) checkNewEdgeAfterRename(
err := c.ShardRequest(
logger, dirId.Shard(),
&msgs.FullReadDirReq{
DirId: dirId,
DirId: dirId,
StartName: name,
Flags: msgs.FULL_READ_DIR_CURRENT | msgs.FULL_READ_DIR_SAME_NAME | msgs.FULL_READ_DIR_BACKWARDS,
Flags: msgs.FULL_READ_DIR_CURRENT | msgs.FULL_READ_DIR_SAME_NAME | msgs.FULL_READ_DIR_BACKWARDS,
},
&fullReadDirResponse,
)
@@ -86,7 +86,7 @@ func (c *Client) checkNewEdgeAfterRename(
}
const edgeRenameMaxFuzzNs = msgs.TernTime(60 * 1000 * 1000 * 1000) // 60 seconds
if delta > edgeRenameMaxFuzzNs {
continue;
continue
}
*creationTime = result.CreationTime
go/client/waitregistry.go
+1 -1
View File
@@ -73,7 +73,7 @@ func WaitForClient(log *log.Logger, registryAddress string, timeout time.Duratio
continue
}
}
if (!client.IsReady()) {
if !client.IsReady() {
log.Info("client not ready, waiting")
time.Sleep(time.Second)
continue
go/core/managedprocess/managedprocess.go
+10 -10
View File
@@ -422,16 +422,16 @@ func (procs *ManagedProcesses) StartFuse(ll *log.Logger, opts *FuseOpts) string
}
type RegistryOpts struct {
Exe string
Dir string
Replica msgs.ReplicaId
LogLevel log.LogLevel
Stale time.Duration
Xmon string
RegistryAddress string
Addr1 string
Addr2 string
LogsDBFlags []string
Exe string
Dir string
Replica msgs.ReplicaId
LogLevel log.LogLevel
Stale time.Duration
Xmon string
RegistryAddress string
Addr1 string
Addr2 string
LogsDBFlags []string
UsingDynamicPorts bool
}
go/core/rs/rs_test.go
+1 -1
View File
@@ -63,7 +63,7 @@ func TestComputeParity(t *testing.T) {
}
haveBlocksBit := uint32(0)
for _, blockIx := range haveBlocks {
haveBlocksBit |= uint32(1)<<blockIx
haveBlocksBit |= uint32(1) << blockIx
}
recoveredBlock := rs.Recover(haveBlocksBit, have, wantBlock)
assert.EqualBytes(t, blocks[wantBlock], recoveredBlock)
go/msgs/msgs.go
+3 -3
View File
@@ -1435,12 +1435,12 @@ type SetTimeResp struct{}
type LinkEntry struct {
Id InodeId
OwnerId InodeId
Time TernTime
Time TernTime
}
type GetLinkEntriesReq struct {
FromIdx LogIdx
Mtu uint16
Mtu uint16
}
type GetLinkEntriesResp struct {
@@ -1452,7 +1452,7 @@ type WaitStateAppliedReq struct {
Idx LogIdx
}
type WaitStateAppliedResp struct {}
type WaitStateAppliedResp struct{}
// --------------------------------------------------------------------
// CDC requests/responses
go/ternblocks/ternblocks.go
+4 -4
View File
@@ -1050,7 +1050,7 @@ func handleSingleRequest(
}
if now.After(futureCutoffTime) {
log.ErrorNoAlert("block %v is too old to be written (now=%v, futureCutoffTime=%v)", whichReq.BlockId, now, futureCutoffTime)
atomic.AddUint64(&env.stats[blockServiceId].blockTooOldForWrite,1)
atomic.AddUint64(&env.stats[blockServiceId].blockTooOldForWrite, 1)
return handleRequestError(log, blockServices, deadBlockServices, conn, lastError, blockServiceId, kind, msgs.BLOCK_TOO_OLD_FOR_WRITE)
}
if err := checkWriteCertificate(log, blockService.cipher, blockServiceId, whichReq, env.stats[blockServiceId]); err != nil {
@@ -1606,7 +1606,7 @@ func main() {
l.Info("block service %v at %v, storage class %v", id, blockService.path, blockService.storageClass)
}
if len(blockServices) + failedBlockServiceCount != flag.NArg()/2 {
if len(blockServices)+failedBlockServiceCount != flag.NArg()/2 {
panic(fmt.Errorf("duplicate block services"))
}
@@ -1755,7 +1755,7 @@ func main() {
return
}
if (*dscp != 0) {
if *dscp != 0 {
// check if client wants to override DSCP
ipv4Conn := ipv4.NewConn(conn)
currentDSCP, err := ipv4Conn.TOS()
@@ -1763,7 +1763,7 @@ func main() {
terminateChan <- err
return
}
if currentDSCP >> 2 == 0 {
if currentDSCP>>2 == 0 {
// Client did not set DSCP, so we set it
// Note that we shift left by 2 as the lower 2 bits are used for ECN
err = ipv4Conn.SetTOS(int(*dscp) << 2)
go/terncli/terncli.go
+6 -3
View File
@@ -893,11 +893,11 @@ func main() {
panic(err)
}
}
if flagsToClear & msgs.TERNFS_BLOCK_SERVICE_DECOMMISSIONED != msgs.TERNFS_BLOCK_SERVICE_EMPTY {
if flagsToClear&msgs.TERNFS_BLOCK_SERVICE_DECOMMISSIONED != msgs.TERNFS_BLOCK_SERVICE_EMPTY {
fmt.Fprintf(os.Stderr, "cannot unset DECOMMISSIONED flag\n")
os.Exit(2)
}
if flagsToSet & flagsToClear != msgs.TERNFS_BLOCK_SERVICE_EMPTY {
if flagsToSet&flagsToClear != msgs.TERNFS_BLOCK_SERVICE_EMPTY {
fmt.Fprintf(os.Stderr, "there can not be intersection between -set and -unset\n")
os.Exit(2)
}
@@ -1099,7 +1099,10 @@ func main() {
location msgs.Location
storage msgs.StorageClass
}
groupTotals := make(map[locClassKey]struct{ current uint64; snapshot uint64 })
groupTotals := make(map[locClassKey]struct {
current uint64
snapshot uint64
})
groupTotalsMutex := sync.Mutex{}
histogram := timing.NewHistogram(256, 255, 1.15) // max: ~900PB
histoLogicalSizeBins := make([]uint64, 256)
go/terngc/terngc.go
+1 -1
View File
@@ -159,7 +159,7 @@ func main() {
os.Exit(2)
}
if (*migrate) {
if *migrate {
if *migrateLocation >= 256 {
fmt.Fprintf(os.Stderr, "-migrate-location must be set and between 0 and 255\n")
}
go/ternregistryproxy/ternregistryproxy.go
+9 -9
View File
@@ -28,16 +28,16 @@ import (
)
type state struct {
counters map[msgs.RegistryMessageKind]*timing.Timings
config *registryProxyConfig
counters map[msgs.RegistryMessageKind]*timing.Timings
config *registryProxyConfig
registryConn *client.RegistryConn
}
type registryProxyConfig struct {
addrs msgs.AddrsInfo
location msgs.Location
addrs msgs.AddrsInfo
location msgs.Location
registryAddress string
numHandlers uint
numHandlers uint
}
func newState(
@@ -46,7 +46,7 @@ func newState(
idb *log.InfluxDB,
) *state {
st := &state{
config: conf,
config: conf,
registryConn: client.MakeRegistryConn(l, nil, conf.registryAddress, conf.numHandlers),
}
@@ -539,9 +539,9 @@ func main() {
}
config := &registryProxyConfig{
addrs: msgs.AddrsInfo{msgs.IpPort{ownIp1, ownPort1}, msgs.IpPort{ownIp2, ownPort2}},
location: msgs.Location(*location),
numHandlers: *numHandlers,
addrs: msgs.AddrsInfo{msgs.IpPort{ownIp1, ownPort1}, msgs.IpPort{ownIp2, ownPort2}},
location: msgs.Location(*location),
numHandlers: *numHandlers,
registryAddress: *registryAddress,
}
state := newState(log, config, influxDB)
go/ternrun/ternrun.go
+7 -7
View File
@@ -158,13 +158,13 @@ func main() {
}
opts := managedprocess.RegistryOpts{
Exe: cppExes.RegistryExe,
LogLevel: level,
Dir: dir,
RegistryAddress: registryAddress,
Replica: msgs.ReplicaId(r),
Xmon: *xmon,
Addr1: "127.0.0.1:0",
Exe: cppExes.RegistryExe,
LogLevel: level,
Dir: dir,
RegistryAddress: registryAddress,
Replica: msgs.ReplicaId(r),
Xmon: *xmon,
Addr1: "127.0.0.1:0",
UsingDynamicPorts: true,
}
if r == 0 {
go/terntests/terntests.go
+5 -5
View File
@@ -750,8 +750,8 @@ func (r *RunTests) run(
}
{
req := &msgs.FullReadDirReq{
DirId: dirId,
Flags: msgs.FULL_READ_DIR_SAME_NAME,
DirId: dirId,
Flags: msgs.FULL_READ_DIR_SAME_NAME,
StartName: fileName,
}
resp := &msgs.FullReadDirResp{}
@@ -775,7 +775,7 @@ func (r *RunTests) run(
if err := os.WriteFile(path.Join(r.mountPoint, sourceDirName, fileName), []byte("test"), 0666); err != nil {
panic(err)
}
if err := os.Rename(path.Join(r.mountPoint, sourceDirName, fileName),path.Join(r.mountPoint, dirName, fileName)); err != nil {
if err := os.Rename(path.Join(r.mountPoint, sourceDirName, fileName), path.Join(r.mountPoint, dirName, fileName)); err != nil {
panic(err)
}
if err := os.Remove(path.Join(r.mountPoint, dirName, fileName)); err != nil {
@@ -783,8 +783,8 @@ func (r *RunTests) run(
}
{
req := &msgs.FullReadDirReq{
DirId: dirId,
Flags: msgs.FULL_READ_DIR_SAME_NAME,
DirId: dirId,
Flags: msgs.FULL_READ_DIR_SAME_NAME,
StartName: fileName,
}
resp := &msgs.FullReadDirResp{}