Skip to content

Commit

Permalink
feat(metarepos): rename the executable from vmr to varlogmr
Browse files Browse the repository at this point in the history
  • Loading branch information
ijsong committed Oct 10, 2023
1 parent b1e8432 commit 0ef2d85
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 24 deletions.
11 changes: 5 additions & 6 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -27,18 +27,17 @@
*.out
*.app

bin/varlogadm
bin/varlogmr
bin/mrtool
bin/varlogsn
bin/varlogctl
bin/vmr
bin/vms
bin/vsn
bin/varlogcli
bin/rpc_test_server
bin/rpcbench_client
bin/rpcbench_server
bin/benchmark
bin/varlogcli
bin/stress
bin/varlogsn
bin/varlogadm

# Python
*.pyc
Expand Down
12 changes: 6 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -30,18 +30,18 @@ precommit: mod-tidy mod-vendor proto generate fmt vet lint build test test_py

# build
BIN_DIR := $(CURDIR)/bin
VMR := $(BIN_DIR)/vmr
VARLOGMR := $(BIN_DIR)/varlogmr
VARLOGADM := $(BIN_DIR)/varlogadm
VARLOGSN := $(BIN_DIR)/varlogsn
VARLOGCTL := $(BIN_DIR)/varlogctl
VARLOGCLI := $(BIN_DIR)/varlogcli
MRTOOL := $(BIN_DIR)/mrtool
BENCHMARK := $(BIN_DIR)/benchmark

.PHONY: build vmr varlogadm varlogsn varlogctl varlogcli mrtool benchmark
build: vmr varlogadm varlogsn varlogctl varlogcli mrtool benchmark
vmr:
$(GO) build $(GCFLAGS) $(LDFLAGS) -o $(VMR) $(CURDIR)/cmd/varlogmr
.PHONY: build varlogmr varlogadm varlogsn varlogctl varlogcli mrtool benchmark
build: varlogmr varlogadm varlogsn varlogctl varlogcli mrtool benchmark
varlogmr:
$(GO) build $(GCFLAGS) $(LDFLAGS) -o $(VARLOGMR) $(CURDIR)/cmd/varlogmr
varlogadm:
$(GO) build $(GCFLAGS) $(LDFLAGS) -o $(VARLOGADM) $(CURDIR)/cmd/varlogadm
varlogsn:
Expand Down Expand Up @@ -159,7 +159,7 @@ mod-vendor-check:
clean:
$(GO) clean
$(RM) $(GO_COVERAGE_OUTPUT) $(PYTHON_COVERAGE_OUTPUT)
$(RM) $(VMR) $(VARLOGADM) $(VARLOGSN) $(VARLOGCTL) $(VARLOGCLI) $(MRTOOL) $(BENCHMARK)
$(RM) $(VARLOGMR) $(VARLOGADM) $(VARLOGSN) $(VARLOGCTL) $(VARLOGCLI) $(MRTOOL) $(BENCHMARK)

clean_mock:
@$(foreach path,$(shell $(GO) list ./... | grep -v vendor | sed -e s#github.com/kakao/varlog/##),$(RM) -f $(path)/*_mock.go;)
9 changes: 0 additions & 9 deletions bin/.gitignore

This file was deleted.

4 changes: 2 additions & 2 deletions bin/start_varlogmr.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
from varlog.killer import Killer # noqa
from varlog.logger import get_logger # noqa

APP_NAME = "vmr"
APP_NAME = "varlogmr"
DEFAULT_CLUSTER_ID = 1
DEFAULT_RPC_PORT = 9092
DEFAULT_RAFT_PORT = 10000
Expand Down Expand Up @@ -199,7 +199,7 @@ def start(
peers = fetch_peers(cluster_id, seed)

cmd = [
f"{binpath}/vmr",
f"{binpath}/varlogmr",
"start",
f"--cluster-id={cluster_id}",
f"--raft-address={raft_addr}",
Expand Down
2 changes: 1 addition & 1 deletion tests/ee/cluster/local/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ func newConfig(opts []Option) (config, error) {
}

cfg := config{
mrExecutable: filepath.Join(binDir(), "vmr"),
mrExecutable: filepath.Join(binDir(), "varlogmr"),
mrPortBase: defaultMRPortBase,
adminExecutable: filepath.Join(binDir(), "varlogadm"),
adminAddr: defaultAdminAddr,
Expand Down

0 comments on commit 0ef2d85

Please sign in to comment.