Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix server lock up in high load scenarios #1

Merged
merged 1 commit into from
Feb 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions .github/workflows/integration-tests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
name: Tests

on: [ push ]

env:
GO_VERSION: 1.21.6

jobs:
integration-tests:
name: Run integration tests
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
- name: Setup Go
uses: actions/setup-go@v4
with:
go-version: ${{ env.GO_VERSION }}
- name: Build
run: go build -v ./...
- name: Run integration tests
run: go test -json ./test/integration > IntegrationTestResults-${{ env.GO_VERSION }}.json
- name: Upload Go integration tests results
uses: actions/upload-artifact@v4
with:
name: Go-results-${{ env.GO_VERSION }}
path: IntegrationTestResults-${{ env.GO_VERSION }}.json
6 changes: 3 additions & 3 deletions cmd/cli/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@ package main

import (
"context"
"fmt"
"github.com/nitwhiz/omnilock/pkg/server"
"log"
)

func main() {
s, err := server.New(context.Background())

if err != nil {
fmt.Println(err)
log.Println(err)
return
}

s.Accept()
s.Run()
}
31 changes: 29 additions & 2 deletions pkg/client/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ import (
"context"
"github.com/nitwhiz/omnilock/pkg/id"
"net"
"sync"
"time"
)

type Client struct {
Expand All @@ -13,6 +15,7 @@ type Client struct {
conn net.Conn
reader *bufio.Reader
cmdChan chan<- *Command
mu *sync.Mutex
}

func New(ctx context.Context, conn net.Conn, cmdChan chan<- *Command) *Client {
Expand All @@ -22,11 +25,24 @@ func New(ctx context.Context, conn net.Conn, cmdChan chan<- *Command) *Client {
conn: conn,
reader: bufio.NewReader(conn),
cmdChan: cmdChan,
mu: &sync.Mutex{},
}

return &c
}

func (c *Client) Done() <-chan struct{} {
return c.ctx.Done()
}

func (c *Client) Lock() {
c.mu.Lock()
}

func (c *Client) Unlock() {
c.mu.Unlock()
}

func (c *Client) GetID() uint64 {
return c.id
}
Expand All @@ -35,7 +51,13 @@ func (c *Client) GetContext() context.Context {
return c.ctx
}

func (c *Client) Write(b []byte) (int, error) {
func (c *Client) Write(b []byte, timeout time.Duration) (int, error) {
err := c.conn.SetWriteDeadline(time.Now().Add(timeout))

if err != nil {
return 0, err
}

return c.conn.Write(b)
}

Expand All @@ -46,9 +68,14 @@ func (c *Client) waitForCommand() bool {
return false
}

c.cmdChan <- &Command{
select {
case <-c.ctx.Done():
return false
case c.cmdChan <- &Command{
Client: c,
Cmd: cmdString[:len(cmdString)-1],
}:
break
}

return true
Expand Down
72 changes: 72 additions & 0 deletions pkg/lock/lock_table.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
package lock

import (
"context"
"github.com/nitwhiz/omnilock/pkg/util"
"sync"
"time"
)

type Table struct {
locks *util.Map[string, uint64]
}

func NewTable() *Table {
return &Table{
locks: util.NewMap[string, uint64](),
}
}

func (t *Table) TryLock(name string, clientId uint64) bool {
return t.locks.TryPut(name, clientId)
}

func (t *Table) Lock(ctx context.Context, name string, clientId uint64) bool {
if t.TryLock(name, clientId) {
return true
}

result := false

wg := &sync.WaitGroup{}
isRunning := false

go func() {
wg.Add(1)
defer wg.Done()

isRunning = true

for {
select {
case <-ctx.Done():
return
case <-time.After(time.Microsecond * 250):
if t.TryLock(name, clientId) {
result = true
return
}

break
}
}
}()

for !isRunning {
<-time.After(time.Millisecond)
}

wg.Wait()

return result
}

func (t *Table) Unlock(name string, clientId uint64) bool {
return t.locks.RemoveIf(name, func(v uint64) bool {
return clientId == v
})
}

func (t *Table) UnlockAll(clientId uint64) {
t.locks.RemoveByValue(clientId)
}
67 changes: 0 additions & 67 deletions pkg/locking/lock_table.go

This file was deleted.

85 changes: 0 additions & 85 deletions pkg/locking/table.go

This file was deleted.

Loading
Loading