From ef1a183c98025062c1692beed75f68af83e95242 Mon Sep 17 00:00:00 2001 From: joaquin Date: Fri, 7 Aug 2020 14:39:34 -0700 Subject: [PATCH 1/9] systemd for multiple nodes docs/examples --- contrib/systemd/multi-nodes/README.md | 3 +++ .../systemd/multi-nodes/dgraph-alpha1.service | 15 +++++++++++++++ .../systemd/multi-nodes/dgraph-alpha2.service | 15 +++++++++++++++ .../systemd/multi-nodes/dgraph-alpha3.service | 15 +++++++++++++++ contrib/systemd/multi-nodes/dgraph-ui.service | 16 ++++++++++++++++ contrib/systemd/multi-nodes/dgraph-zero0.service | 15 +++++++++++++++ contrib/systemd/multi-nodes/dgraph-zero1.service | 15 +++++++++++++++ contrib/systemd/multi-nodes/dgraph-zero2.service | 15 +++++++++++++++ 8 files changed, 109 insertions(+) create mode 100644 contrib/systemd/multi-nodes/README.md create mode 100644 contrib/systemd/multi-nodes/dgraph-alpha1.service create mode 100644 contrib/systemd/multi-nodes/dgraph-alpha2.service create mode 100644 contrib/systemd/multi-nodes/dgraph-alpha3.service create mode 100644 contrib/systemd/multi-nodes/dgraph-ui.service create mode 100644 contrib/systemd/multi-nodes/dgraph-zero0.service create mode 100644 contrib/systemd/multi-nodes/dgraph-zero1.service create mode 100644 contrib/systemd/multi-nodes/dgraph-zero2.service diff --git a/contrib/systemd/multi-nodes/README.md b/contrib/systemd/multi-nodes/README.md new file mode 100644 index 00000000000..acbcc47e95a --- /dev/null +++ b/contrib/systemd/multi-nodes/README.md @@ -0,0 +1,3 @@ +# systemd configuration for multiple ndoes. + +This following document describes how to configure several nodes that are managed through [systemd](https://systemd.io/). diff --git a/contrib/systemd/multi-nodes/dgraph-alpha1.service b/contrib/systemd/multi-nodes/dgraph-alpha1.service new file mode 100644 index 00000000000..4ffd888cb91 --- /dev/null +++ b/contrib/systemd/multi-nodes/dgraph-alpha1.service @@ -0,0 +1,15 @@ +[Unit] +Description=dgraph.io data server +Wants=network.target +After=network.target + +[Service] +Type=simple +ExecStart=/usr/local/bin/dgraph alpha --my=$(hostname):7080 --lru_mb 2048 --zero :5080,:5080,:5080 -p /var/run/dgraph/p -w /var/run/dgraph/w +StandardOutput=journal +StandardError=journal +User=dgraph +Group=dgraph + +[Install] +WantedBy=multi-user.target diff --git a/contrib/systemd/multi-nodes/dgraph-alpha2.service b/contrib/systemd/multi-nodes/dgraph-alpha2.service new file mode 100644 index 00000000000..4ffd888cb91 --- /dev/null +++ b/contrib/systemd/multi-nodes/dgraph-alpha2.service @@ -0,0 +1,15 @@ +[Unit] +Description=dgraph.io data server +Wants=network.target +After=network.target + +[Service] +Type=simple +ExecStart=/usr/local/bin/dgraph alpha --my=$(hostname):7080 --lru_mb 2048 --zero :5080,:5080,:5080 -p /var/run/dgraph/p -w /var/run/dgraph/w +StandardOutput=journal +StandardError=journal +User=dgraph +Group=dgraph + +[Install] +WantedBy=multi-user.target diff --git a/contrib/systemd/multi-nodes/dgraph-alpha3.service b/contrib/systemd/multi-nodes/dgraph-alpha3.service new file mode 100644 index 00000000000..4ffd888cb91 --- /dev/null +++ b/contrib/systemd/multi-nodes/dgraph-alpha3.service @@ -0,0 +1,15 @@ +[Unit] +Description=dgraph.io data server +Wants=network.target +After=network.target + +[Service] +Type=simple +ExecStart=/usr/local/bin/dgraph alpha --my=$(hostname):7080 --lru_mb 2048 --zero :5080,:5080,:5080 -p /var/run/dgraph/p -w /var/run/dgraph/w +StandardOutput=journal +StandardError=journal +User=dgraph +Group=dgraph + +[Install] +WantedBy=multi-user.target diff --git a/contrib/systemd/multi-nodes/dgraph-ui.service b/contrib/systemd/multi-nodes/dgraph-ui.service new file mode 100644 index 00000000000..90968f06b97 --- /dev/null +++ b/contrib/systemd/multi-nodes/dgraph-ui.service @@ -0,0 +1,16 @@ +[Unit] +Description=dgraph.io UI server +Wants=network.target +After=network.target + +[Service] +Type=simple +ExecStart=/usr/local/bin/dgraph-ratel +Restart=on-failure +StandardOutput=journal +StandardError=journal +User=dgraph +Group=dgraph + +[Install] +WantedBy=multi-user.target diff --git a/contrib/systemd/multi-nodes/dgraph-zero0.service b/contrib/systemd/multi-nodes/dgraph-zero0.service new file mode 100644 index 00000000000..53b3a152cae --- /dev/null +++ b/contrib/systemd/multi-nodes/dgraph-zero0.service @@ -0,0 +1,15 @@ +[Unit] +Description=dgraph.io data server +Wants=network.target +After=network.target + +[Service] +Type=simple +ExecStart=/usr/local/bin/dgraph zero --my=$(hostname):5080 -w /var/run/dgraph/w --idx=1 --replicas 3 +StandardOutput=journal +StandardError=journal +User=dgraph +Group=dgraph + +[Install] +WantedBy=multi-user.target diff --git a/contrib/systemd/multi-nodes/dgraph-zero1.service b/contrib/systemd/multi-nodes/dgraph-zero1.service new file mode 100644 index 00000000000..cae1ff38ccf --- /dev/null +++ b/contrib/systemd/multi-nodes/dgraph-zero1.service @@ -0,0 +1,15 @@ +[Unit] +Description=dgraph.io data server +Wants=network.target +After=network.target + +[Service] +Type=simple +ExecStart=/usr/local/bin/dgraph zero --my=$(hostname):5080 --peer :5080 -w /var/run/dgraph/w --idx=2 --replicas 3 +StandardOutput=journal +StandardError=journal +User=dgraph +Group=dgraph + +[Install] +WantedBy=multi-user.target diff --git a/contrib/systemd/multi-nodes/dgraph-zero2.service b/contrib/systemd/multi-nodes/dgraph-zero2.service new file mode 100644 index 00000000000..4abd9a3f909 --- /dev/null +++ b/contrib/systemd/multi-nodes/dgraph-zero2.service @@ -0,0 +1,15 @@ +[Unit] +Description=dgraph.io data server +Wants=network.target +After=network.target + +[Service] +Type=simple +ExecStart=/usr/local/bin/dgraph zero --my=$(hostname):5080 --peer :5080 -w /var/run/dgraph/w --idx=3 --replicas 3 +StandardOutput=journal +StandardError=journal +User=dgraph +Group=dgraph + +[Install] +WantedBy=multi-user.target From c294c10e575c5f0e5f9ee82f3dcbd74d8d11ee73 Mon Sep 17 00:00:00 2001 From: Joaquin Date: Fri, 7 Aug 2020 17:17:25 -0700 Subject: [PATCH 2/9] initial attempt --- worker/mutation.go | 2 ++ x/metrics.go | 9 +++++++++ 2 files changed, 11 insertions(+) diff --git a/worker/mutation.go b/worker/mutation.go index 4bf39ec345b..d4bcee88de6 100644 --- a/worker/mutation.go +++ b/worker/mutation.go @@ -19,6 +19,7 @@ package worker import ( "bytes" "context" + ostats "go.opencensus.io/stats" "math" "sync" "sync/atomic" @@ -783,6 +784,7 @@ func CommitOverNetwork(ctx context.Context, tc *api.TxnContext) (uint64, error) span.Annotate(attributes, "") if tctx.Aborted || tctx.CommitTs == 0 { + ostats.Record(context.Background(), x.TxnAborts.M(1)) return 0, dgo.ErrAborted } return tctx.CommitTs, nil diff --git a/x/metrics.go b/x/metrics.go index fa995ee1fce..f70fc49d089 100644 --- a/x/metrics.go +++ b/x/metrics.go @@ -81,6 +81,8 @@ var ( // MaxAssignedTs records the latest max assigned timestamp. MaxAssignedTs = stats.Int64("max_assigned_ts", "Latest max assigned timestamp", stats.UnitDimensionless) + TxnAborts = stats.Int64("txn_aborts", + "Number of transaction aborts",stats.UnitDimensionless) // Conf holds the metrics config. // TODO: Request statistics, latencies, 500, timeouts @@ -147,6 +149,13 @@ var ( Aggregation: view.Count(), TagKeys: allTagKeys, }, + { + Name: TxnAborts.Name(), + Measure: TxnAborts, + Description: TxnAborts.Description(), + Aggregation: view.Count(), + TagKeys: allTagKeys, + }, // Last value aggregations { From 4cd3086a89900e48bac3b56b53e6028724edb668 Mon Sep 17 00:00:00 2001 From: Joaquin Date: Sat, 8 Aug 2020 13:36:06 -0700 Subject: [PATCH 3/9] WIP: placeholder - saving work --- dgraph/cmd/alpha/metrics_test.go | 54 ++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/dgraph/cmd/alpha/metrics_test.go b/dgraph/cmd/alpha/metrics_test.go index 22925710199..505dca5b6f9 100644 --- a/dgraph/cmd/alpha/metrics_test.go +++ b/dgraph/cmd/alpha/metrics_test.go @@ -17,6 +17,9 @@ package alpha import ( + "bytes" + "github.com/dgraph-io/dgo/v200/protos/api" + "github.com/dgraph-io/dgraph/x" "net/http" "regexp" "strings" @@ -25,6 +28,57 @@ import ( "github.com/stretchr/testify/require" ) +func TestMetricTxnAborts(t *testing.T) { + t.Log("a string") + t.Fail() + + // borrowed from integraiton/testxn/main_test.go + // 1. create two transactions + // 2. commit two transactions + // 3. test metric of any number, should exist + // 4. save result of metric + // 5. create 10 transactions + // 6. commit 10 transactions + // 7. test that metric is +10 from original amount + + op := &api.Operation{} + op.DropAll = true + require.NoError(t, s.dg.Alter(context.Background(), op)) + + txn := s.dg.NewTxn() + + mu := &api.Mutation{} + mu.SetJson = []byte(`{"name": "Manish"}`) + assigned, err := txn.Mutate(context.Background(), mu) + if err != nil { + log.Fatalf("Error while running mutation: %v\n", err) + } + if len(assigned.Uids) != 1 { + log.Fatalf("Error. Nothing assigned. %+v\n", assigned) + } + var uid string + for _, u := range assigned.Uids { + uid = u + } + + txn2 := s.dg.NewTxn() + mu = &api.Mutation{} + mu.SetJson = []byte(fmt.Sprintf(`{"uid": "%s", "name": "Manish"}`, uid)) + x.Check2(txn2.Mutate(context.Background(), mu)) + + require.NoError(t, txn.Commit(context.Background())) + err = txn2.Commit(context.Background()) + x.AssertTrue(err != nil) + + txn = s.dg.NewTxn() + q := fmt.Sprintf(`{ me(func: uid(%s)) { name }}`, uid) + resp, err := txn.Query(context.Background(), q) + if err != nil { + log.Fatalf("Error while running query: %v\n", err) + } + x.AssertTrue(bytes.Equal(resp.Json, []byte("{\"me\":[{\"name\":\"Manish\"}]}"))) +} + func TestMetrics(t *testing.T) { req, err := http.NewRequest("GET", addr+"/debug/prometheus_metrics", nil) require.NoError(t, err) From a78bcd65ba7775dbb02c5b30091fc266e045a8a3 Mon Sep 17 00:00:00 2001 From: Joaquin Date: Tue, 11 Aug 2020 19:23:19 -0700 Subject: [PATCH 4/9] wip: attempt to get dgraph_txn_aborts to tick --- dgraph/cmd/alpha/metrics_test.go | 63 ++++++++------------------------ 1 file changed, 15 insertions(+), 48 deletions(-) diff --git a/dgraph/cmd/alpha/metrics_test.go b/dgraph/cmd/alpha/metrics_test.go index 505dca5b6f9..da0c571473d 100644 --- a/dgraph/cmd/alpha/metrics_test.go +++ b/dgraph/cmd/alpha/metrics_test.go @@ -17,9 +17,6 @@ package alpha import ( - "bytes" - "github.com/dgraph-io/dgo/v200/protos/api" - "github.com/dgraph-io/dgraph/x" "net/http" "regexp" "strings" @@ -28,55 +25,25 @@ import ( "github.com/stretchr/testify/require" ) -func TestMetricTxnAborts(t *testing.T) { - t.Log("a string") - t.Fail() - - // borrowed from integraiton/testxn/main_test.go - // 1. create two transactions - // 2. commit two transactions - // 3. test metric of any number, should exist - // 4. save result of metric - // 5. create 10 transactions - // 6. commit 10 transactions - // 7. test that metric is +10 from original amount - - op := &api.Operation{} - op.DropAll = true - require.NoError(t, s.dg.Alter(context.Background(), op)) +//type state struct { +// dg *dgo.Dgraph +//} +//var s state - txn := s.dg.NewTxn() - - mu := &api.Mutation{} - mu.SetJson = []byte(`{"name": "Manish"}`) - assigned, err := txn.Mutate(context.Background(), mu) - if err != nil { - log.Fatalf("Error while running mutation: %v\n", err) - } - if len(assigned.Uids) != 1 { - log.Fatalf("Error. Nothing assigned. %+v\n", assigned) - } - var uid string - for _, u := range assigned.Uids { - uid = u +func TestMetricTxnAborts(t *testing.T) { + m1 := ` + { + set { + <0x71> "Bob" . + } } + ` - txn2 := s.dg.NewTxn() - mu = &api.Mutation{} - mu.SetJson = []byte(fmt.Sprintf(`{"uid": "%s", "name": "Manish"}`, uid)) - x.Check2(txn2.Mutate(context.Background(), mu)) - - require.NoError(t, txn.Commit(context.Background())) - err = txn2.Commit(context.Background()) - x.AssertTrue(err != nil) - - txn = s.dg.NewTxn() - q := fmt.Sprintf(`{ me(func: uid(%s)) { name }}`, uid) - resp, err := txn.Query(context.Background(), q) - if err != nil { - log.Fatalf("Error while running query: %v\n", err) + for i := 1; i <= 1200; i++ { + _, err := mutationWithTs(m1, "application/rdf", false, false, ts) + require.NoError(t, err) } - x.AssertTrue(bytes.Equal(resp.Json, []byte("{\"me\":[{\"name\":\"Manish\"}]}"))) + } func TestMetrics(t *testing.T) { From 939cee93c1e55e6621b9c9f5b30d8698e5683355 Mon Sep 17 00:00:00 2001 From: Joaquin Date: Wed, 12 Aug 2020 00:44:19 -0700 Subject: [PATCH 5/9] wip: update ticking up metric --- dgraph/cmd/alpha/metrics_test.go | 31 ++++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/dgraph/cmd/alpha/metrics_test.go b/dgraph/cmd/alpha/metrics_test.go index da0c571473d..621b589ee5f 100644 --- a/dgraph/cmd/alpha/metrics_test.go +++ b/dgraph/cmd/alpha/metrics_test.go @@ -25,11 +25,6 @@ import ( "github.com/stretchr/testify/require" ) -//type state struct { -// dg *dgo.Dgraph -//} -//var s state - func TestMetricTxnAborts(t *testing.T) { m1 := ` { @@ -38,14 +33,32 @@ func TestMetricTxnAborts(t *testing.T) { } } ` + mr1, err := mutationWithTs(m1, "application/rdf", false, false, ts) + require.NoError(t, err) - for i := 1; i <= 1200; i++ { - _, err := mutationWithTs(m1, "application/rdf", false, false, ts) - require.NoError(t, err) - } + mr2, err := mutationWithTs(m1, "application/rdf", false, false, ts) + require.NoError(t, err) + + require.NoError(t, commitWithTs(mr1.keys, mr1.preds, mr1.startTs)) + // Create 'dgraph_txn_aborts' metric + require.Error(t, commitWithTs(mr2.keys, mr2.preds, mr2.startTs)) + + + // Fetch Metrics + req, err := http.NewRequest("GET", addr+"/debug/prometheus_metrics", nil) + require.NoError(t, err) + + _, body, err := runRequest(req) + require.NoError(t, err) + metricsMap, err := extractMetrics(string(body)) + requiredMetric := "dgraph_txn_aborts" + _, ok := metricsMap[requiredMetric] + require.True(t, ok, "the required metric %s is not found", requiredMetric) } + + func TestMetrics(t *testing.T) { req, err := http.NewRequest("GET", addr+"/debug/prometheus_metrics", nil) require.NoError(t, err) From aa9b827821ca669de48c31efff24ee7be09a1524 Mon Sep 17 00:00:00 2001 From: Joaquin Date: Wed, 12 Aug 2020 11:27:02 -0700 Subject: [PATCH 6/9] wip: working test --- dgraph/cmd/alpha/metrics_test.go | 43 ++++++++++++++++++++++---------- 1 file changed, 30 insertions(+), 13 deletions(-) diff --git a/dgraph/cmd/alpha/metrics_test.go b/dgraph/cmd/alpha/metrics_test.go index 621b589ee5f..4579382d1d8 100644 --- a/dgraph/cmd/alpha/metrics_test.go +++ b/dgraph/cmd/alpha/metrics_test.go @@ -19,6 +19,7 @@ package alpha import ( "net/http" "regexp" + "strconv" "strings" "testing" @@ -26,38 +27,53 @@ import ( ) func TestMetricTxnAborts(t *testing.T) { - m1 := ` + mt := ` { set { <0x71> "Bob" . } } ` - mr1, err := mutationWithTs(m1, "application/rdf", false, false, ts) - require.NoError(t, err) - mr2, err := mutationWithTs(m1, "application/rdf", false, false, ts) + // Create initial 'dgraph_txn_aborts' metric + mr1, err := mutationWithTs(mt, "application/rdf", false, false, ts) + require.NoError(t, err) + mr2, err := mutationWithTs(mt, "application/rdf", false, false, ts) require.NoError(t, err) - require.NoError(t, commitWithTs(mr1.keys, mr1.preds, mr1.startTs)) - // Create 'dgraph_txn_aborts' metric require.Error(t, commitWithTs(mr2.keys, mr2.preds, mr2.startTs)) - // Fetch Metrics req, err := http.NewRequest("GET", addr+"/debug/prometheus_metrics", nil) require.NoError(t, err) - _, body, err := runRequest(req) require.NoError(t, err) metricsMap, err := extractMetrics(string(body)) requiredMetric := "dgraph_txn_aborts" - _, ok := metricsMap[requiredMetric] + txnAbort, ok := metricsMap[requiredMetric] + txnAbort1, _ := strconv.Atoi(txnAbort.(string)) require.True(t, ok, "the required metric %s is not found", requiredMetric) -} + // Create second 'dgraph_txn_aborts' metric + mr1, err = mutationWithTs(mt, "application/rdf", false, false, ts) + require.NoError(t, err) + mr2, err = mutationWithTs(mt, "application/rdf", false, false, ts) + require.NoError(t, err) + require.NoError(t, commitWithTs(mr1.keys, mr1.preds, mr1.startTs)) + require.Error(t, commitWithTs(mr2.keys, mr2.preds, mr2.startTs)) + // Fetch Updated Metrics + req, err = http.NewRequest("GET", addr+"/debug/prometheus_metrics", nil) + require.NoError(t, err) + _, body, err = runRequest(req) + require.NoError(t, err) + metricsMap, err = extractMetrics(string(body)) + requiredMetric = "dgraph_txn_aborts" + txnAbort, ok = metricsMap["dgraph_txn_aborts"] + txnAbort2, _ := strconv.Atoi(txnAbort.(string)) + require.Equal(t, txnAbort1+1, txnAbort2, "txnAbort was not incremented") +} func TestMetrics(t *testing.T) { req, err := http.NewRequest("GET", addr+"/debug/prometheus_metrics", nil) @@ -93,15 +109,16 @@ func TestMetrics(t *testing.T) { func extractMetrics(metrics string) (map[string]interface{}, error) { lines := strings.Split(metrics, "\n") - metricRegex, err := regexp.Compile("(^[a-z0-9_]+)") + metricRegex, err := regexp.Compile("(^\\w+|\\d+$)") + if err != nil { return nil, err } metricsMap := make(map[string]interface{}) for _, line := range lines { - matches := metricRegex.FindStringSubmatch(line) + matches := metricRegex.FindAllString(line, -1) if len(matches) > 0 { - metricsMap[matches[0]] = struct{}{} + metricsMap[matches[0]] = matches[1] } } return metricsMap, nil From a8cf5267162a2f58023bd438fa85be49b89d4f45 Mon Sep 17 00:00:00 2001 From: Joaquin Date: Wed, 12 Aug 2020 11:37:45 -0700 Subject: [PATCH 7/9] remove systemd services --- contrib/systemd/multi-nodes/README.md | 3 --- .../systemd/multi-nodes/dgraph-alpha1.service | 15 --------------- .../systemd/multi-nodes/dgraph-alpha2.service | 15 --------------- .../systemd/multi-nodes/dgraph-alpha3.service | 15 --------------- contrib/systemd/multi-nodes/dgraph-ui.service | 16 ---------------- contrib/systemd/multi-nodes/dgraph-zero0.service | 15 --------------- contrib/systemd/multi-nodes/dgraph-zero1.service | 15 --------------- contrib/systemd/multi-nodes/dgraph-zero2.service | 15 --------------- 8 files changed, 109 deletions(-) delete mode 100644 contrib/systemd/multi-nodes/README.md delete mode 100644 contrib/systemd/multi-nodes/dgraph-alpha1.service delete mode 100644 contrib/systemd/multi-nodes/dgraph-alpha2.service delete mode 100644 contrib/systemd/multi-nodes/dgraph-alpha3.service delete mode 100644 contrib/systemd/multi-nodes/dgraph-ui.service delete mode 100644 contrib/systemd/multi-nodes/dgraph-zero0.service delete mode 100644 contrib/systemd/multi-nodes/dgraph-zero1.service delete mode 100644 contrib/systemd/multi-nodes/dgraph-zero2.service diff --git a/contrib/systemd/multi-nodes/README.md b/contrib/systemd/multi-nodes/README.md deleted file mode 100644 index acbcc47e95a..00000000000 --- a/contrib/systemd/multi-nodes/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# systemd configuration for multiple ndoes. - -This following document describes how to configure several nodes that are managed through [systemd](https://systemd.io/). diff --git a/contrib/systemd/multi-nodes/dgraph-alpha1.service b/contrib/systemd/multi-nodes/dgraph-alpha1.service deleted file mode 100644 index 4ffd888cb91..00000000000 --- a/contrib/systemd/multi-nodes/dgraph-alpha1.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=dgraph.io data server -Wants=network.target -After=network.target - -[Service] -Type=simple -ExecStart=/usr/local/bin/dgraph alpha --my=$(hostname):7080 --lru_mb 2048 --zero :5080,:5080,:5080 -p /var/run/dgraph/p -w /var/run/dgraph/w -StandardOutput=journal -StandardError=journal -User=dgraph -Group=dgraph - -[Install] -WantedBy=multi-user.target diff --git a/contrib/systemd/multi-nodes/dgraph-alpha2.service b/contrib/systemd/multi-nodes/dgraph-alpha2.service deleted file mode 100644 index 4ffd888cb91..00000000000 --- a/contrib/systemd/multi-nodes/dgraph-alpha2.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=dgraph.io data server -Wants=network.target -After=network.target - -[Service] -Type=simple -ExecStart=/usr/local/bin/dgraph alpha --my=$(hostname):7080 --lru_mb 2048 --zero :5080,:5080,:5080 -p /var/run/dgraph/p -w /var/run/dgraph/w -StandardOutput=journal -StandardError=journal -User=dgraph -Group=dgraph - -[Install] -WantedBy=multi-user.target diff --git a/contrib/systemd/multi-nodes/dgraph-alpha3.service b/contrib/systemd/multi-nodes/dgraph-alpha3.service deleted file mode 100644 index 4ffd888cb91..00000000000 --- a/contrib/systemd/multi-nodes/dgraph-alpha3.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=dgraph.io data server -Wants=network.target -After=network.target - -[Service] -Type=simple -ExecStart=/usr/local/bin/dgraph alpha --my=$(hostname):7080 --lru_mb 2048 --zero :5080,:5080,:5080 -p /var/run/dgraph/p -w /var/run/dgraph/w -StandardOutput=journal -StandardError=journal -User=dgraph -Group=dgraph - -[Install] -WantedBy=multi-user.target diff --git a/contrib/systemd/multi-nodes/dgraph-ui.service b/contrib/systemd/multi-nodes/dgraph-ui.service deleted file mode 100644 index 90968f06b97..00000000000 --- a/contrib/systemd/multi-nodes/dgraph-ui.service +++ /dev/null @@ -1,16 +0,0 @@ -[Unit] -Description=dgraph.io UI server -Wants=network.target -After=network.target - -[Service] -Type=simple -ExecStart=/usr/local/bin/dgraph-ratel -Restart=on-failure -StandardOutput=journal -StandardError=journal -User=dgraph -Group=dgraph - -[Install] -WantedBy=multi-user.target diff --git a/contrib/systemd/multi-nodes/dgraph-zero0.service b/contrib/systemd/multi-nodes/dgraph-zero0.service deleted file mode 100644 index 53b3a152cae..00000000000 --- a/contrib/systemd/multi-nodes/dgraph-zero0.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=dgraph.io data server -Wants=network.target -After=network.target - -[Service] -Type=simple -ExecStart=/usr/local/bin/dgraph zero --my=$(hostname):5080 -w /var/run/dgraph/w --idx=1 --replicas 3 -StandardOutput=journal -StandardError=journal -User=dgraph -Group=dgraph - -[Install] -WantedBy=multi-user.target diff --git a/contrib/systemd/multi-nodes/dgraph-zero1.service b/contrib/systemd/multi-nodes/dgraph-zero1.service deleted file mode 100644 index cae1ff38ccf..00000000000 --- a/contrib/systemd/multi-nodes/dgraph-zero1.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=dgraph.io data server -Wants=network.target -After=network.target - -[Service] -Type=simple -ExecStart=/usr/local/bin/dgraph zero --my=$(hostname):5080 --peer :5080 -w /var/run/dgraph/w --idx=2 --replicas 3 -StandardOutput=journal -StandardError=journal -User=dgraph -Group=dgraph - -[Install] -WantedBy=multi-user.target diff --git a/contrib/systemd/multi-nodes/dgraph-zero2.service b/contrib/systemd/multi-nodes/dgraph-zero2.service deleted file mode 100644 index 4abd9a3f909..00000000000 --- a/contrib/systemd/multi-nodes/dgraph-zero2.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=dgraph.io data server -Wants=network.target -After=network.target - -[Service] -Type=simple -ExecStart=/usr/local/bin/dgraph zero --my=$(hostname):5080 --peer :5080 -w /var/run/dgraph/w --idx=3 --replicas 3 -StandardOutput=journal -StandardError=journal -User=dgraph -Group=dgraph - -[Install] -WantedBy=multi-user.target From d95ef1b4f0d34d3760d74c205ac5a79a75b1db51 Mon Sep 17 00:00:00 2001 From: Joaquin Date: Wed, 12 Aug 2020 11:39:30 -0700 Subject: [PATCH 8/9] goimports --- worker/mutation.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/worker/mutation.go b/worker/mutation.go index d4bcee88de6..aa91fede442 100644 --- a/worker/mutation.go +++ b/worker/mutation.go @@ -19,12 +19,13 @@ package worker import ( "bytes" "context" - ostats "go.opencensus.io/stats" "math" "sync" "sync/atomic" "time" + ostats "go.opencensus.io/stats" + "github.com/golang/glog" "github.com/pkg/errors" otrace "go.opencensus.io/trace" From f1aba07d47a232aa46290f7b7eafab8d3a82def4 Mon Sep 17 00:00:00 2001 From: Joaquin Date: Wed, 12 Aug 2020 14:52:33 -0700 Subject: [PATCH 9/9] PR: update based on feedback --- dgraph/cmd/alpha/metrics_test.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dgraph/cmd/alpha/metrics_test.go b/dgraph/cmd/alpha/metrics_test.go index 4579382d1d8..f7ac9a692a0 100644 --- a/dgraph/cmd/alpha/metrics_test.go +++ b/dgraph/cmd/alpha/metrics_test.go @@ -36,9 +36,9 @@ func TestMetricTxnAborts(t *testing.T) { ` // Create initial 'dgraph_txn_aborts' metric - mr1, err := mutationWithTs(mt, "application/rdf", false, false, ts) + mr1, err := mutationWithTs(mt, "application/rdf", false, false, 0) require.NoError(t, err) - mr2, err := mutationWithTs(mt, "application/rdf", false, false, ts) + mr2, err := mutationWithTs(mt, "application/rdf", false, false, 0) require.NoError(t, err) require.NoError(t, commitWithTs(mr1.keys, mr1.preds, mr1.startTs)) require.Error(t, commitWithTs(mr2.keys, mr2.preds, mr2.startTs)) @@ -51,13 +51,13 @@ func TestMetricTxnAborts(t *testing.T) { metricsMap, err := extractMetrics(string(body)) requiredMetric := "dgraph_txn_aborts" txnAbort, ok := metricsMap[requiredMetric] + require.True(t, ok, "the required metric '%s' is not found", requiredMetric) txnAbort1, _ := strconv.Atoi(txnAbort.(string)) - require.True(t, ok, "the required metric %s is not found", requiredMetric) // Create second 'dgraph_txn_aborts' metric - mr1, err = mutationWithTs(mt, "application/rdf", false, false, ts) + mr1, err = mutationWithTs(mt, "application/rdf", false, false, 0) require.NoError(t, err) - mr2, err = mutationWithTs(mt, "application/rdf", false, false, ts) + mr2, err = mutationWithTs(mt, "application/rdf", false, false, 0) require.NoError(t, err) require.NoError(t, commitWithTs(mr1.keys, mr1.preds, mr1.startTs)) require.Error(t, commitWithTs(mr2.keys, mr2.preds, mr2.startTs))