Skip to content

Commit

Permalink
Merge branch 'master' into release/v20.11
Browse files Browse the repository at this point in the history
  • Loading branch information
@aman-bansal
aman-bansal committed Dec 11, 2020
2 parents 7f0e705 + de0c358 commit 7cb96d8
Show file tree
Hide file tree
Showing 110 changed files with 3,737 additions and 2,578 deletions.
61 changes: 30 additions & 31 deletions compose/compose.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ func getAlpha(idx int) service {
svc.Command += fmt.Sprintf(" --zero=%s", zerosOpt)
svc.Command += fmt.Sprintf(" --logtostderr -v=%d", opts.Verbosity)
if opts.LudicrousMode {
svc.Command += " --ludicrous-mode=true"
svc.Command += " --ludicrous_mode=true"
}

// Don't assign idx, let it auto-assign.
Expand All @@ -319,7 +319,7 @@ func getAlpha(idx int) service {
svc.Command += " --whitelist=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16"
}
if opts.Acl {
svc.Command += " --acl-secret-file=/secret/hmac"
svc.Command += " --acl_secret_file=/secret/hmac"
svc.Volumes = append(svc.Volumes, volume{
Type: "bind",
Source: "./acl-secret",
Expand All @@ -328,10 +328,10 @@ func getAlpha(idx int) service {
})
}
if opts.SnapshotAfter != "" {
svc.Command += fmt.Sprintf(" --snapshot-after=%s", opts.SnapshotAfter)
svc.Command += fmt.Sprintf(" --snapshot_after=%s", opts.SnapshotAfter)
}
if opts.AclSecret != "" {
svc.Command += " --acl-secret-file=/secret/hmac"
svc.Command += " --acl_secret_file=/secret/hmac"
svc.Volumes = append(svc.Volumes, volume{
Type: "bind",
Source: opts.AclSecret,
Expand All @@ -345,7 +345,7 @@ func getAlpha(idx int) service {
}
}
if opts.Encryption {
svc.Command += " --encryption-key-file=/secret/enc_key"
svc.Command += " --encryption_key_file=/secret/enc_key"
svc.Volumes = append(svc.Volumes, volume{
Type: "bind",
Source: "./enc-secret",
Expand All @@ -354,7 +354,7 @@ func getAlpha(idx int) service {
})
}
if opts.TlsDir != "" {
svc.Command += " --tls-dir=/secret/tls"
svc.Command += " --tls_dir=/secret/tls"
svc.Volumes = append(svc.Volumes, volume{
Type: "bind",
Source: opts.TlsDir,
Expand Down Expand Up @@ -534,20 +534,19 @@ func main() {
// dummy to get "Usage:" template in Usage() output.
},
}
cmd.SetGlobalNormalizationFunc(x.NormalizeFlags)

cmd.PersistentFlags().IntVarP(&opts.NumZeros, "num-zeros", "z", 3,
cmd.PersistentFlags().IntVarP(&opts.NumZeros, "num_zeros", "z", 3,
"number of zeros in dgraph cluster")
cmd.PersistentFlags().IntVarP(&opts.NumAlphas, "num-alphas", "a", 3,
cmd.PersistentFlags().IntVarP(&opts.NumAlphas, "num_alphas", "a", 3,
"number of alphas in dgraph cluster")
cmd.PersistentFlags().IntVarP(&opts.NumReplicas, "num-replicas", "r", 3,
cmd.PersistentFlags().IntVarP(&opts.NumReplicas, "num_replicas", "r", 3,
"number of alpha replicas in dgraph cluster")
cmd.PersistentFlags().BoolVar(&opts.DataVol, "data-vol", false,
cmd.PersistentFlags().BoolVar(&opts.DataVol, "data_vol", false,
"mount a docker volume as /data in containers")
cmd.PersistentFlags().StringVarP(&opts.DataDir, "data-dir", "d", "",
cmd.PersistentFlags().StringVarP(&opts.DataDir, "data_dir", "d", "",
"mount a host directory as /data in containers")
cmd.PersistentFlags().BoolVar(&opts.Acl, "acl", false, "Create ACL secret file and enable ACLs")
cmd.PersistentFlags().StringVar(&opts.AclSecret, "acl-secret", "",
cmd.PersistentFlags().StringVar(&opts.AclSecret, "acl_secret", "",
"enable ACL feature with specified HMAC secret file")
cmd.PersistentFlags().BoolVarP(&opts.UserOwnership, "user", "u", false,
"run as the current user rather than root")
Expand All @@ -557,7 +556,7 @@ func main() {
"include jaeger service")
cmd.PersistentFlags().BoolVarP(&opts.Metrics, "metrics", "m", false,
"include metrics (prometheus, grafana) services")
cmd.PersistentFlags().IntVarP(&opts.PortOffset, "port-offset", "o", 100,
cmd.PersistentFlags().IntVarP(&opts.PortOffset, "port_offset", "o", 100,
"port offset for alpha and, if not 100, zero as well")
cmd.PersistentFlags().IntVarP(&opts.Verbosity, "verbosity", "v", 2,
"glog verbosity level")
Expand All @@ -573,41 +572,41 @@ func main() {
"include a whitelist if true")
cmd.PersistentFlags().BoolVar(&opts.Ratel, "ratel", false,
"include ratel service")
cmd.PersistentFlags().IntVar(&opts.RatelPort, "ratel-port", 8000,
cmd.PersistentFlags().IntVar(&opts.RatelPort, "ratel_port", 8000,
"Port to expose Ratel service")
cmd.PersistentFlags().StringVarP(&opts.MemLimit, "mem", "", "32G",
"Limit memory provided to the docker containers, for example 8G.")
cmd.PersistentFlags().StringVar(&opts.TlsDir, "tls-dir", "",
cmd.PersistentFlags().StringVar(&opts.TlsDir, "tls_dir", "",
"TLS Dir.")
cmd.PersistentFlags().BoolVar(&opts.ExposePorts, "expose-ports", true,
cmd.PersistentFlags().BoolVar(&opts.ExposePorts, "expose_ports", true,
"expose host:container ports for each service")
cmd.PersistentFlags().StringVar(&opts.Vmodule, "vmodule", "",
"comma-separated list of pattern=N settings for file-filtered logging")
cmd.PersistentFlags().BoolVar(&opts.Encryption, "encryption", false,
"enable encryption-at-rest feature.")
cmd.PersistentFlags().BoolVar(&opts.LudicrousMode, "ludicrous-mode", false,
cmd.PersistentFlags().BoolVar(&opts.LudicrousMode, "ludicrous_mode", false,
"enable zeros and alphas in ludicrous mode.")
cmd.PersistentFlags().StringVar(&opts.SnapshotAfter, "snapshot-after", "",
cmd.PersistentFlags().StringVar(&opts.SnapshotAfter, "snapshot_after", "",
"create a new Raft snapshot after this many number of Raft entries.")
cmd.PersistentFlags().StringVar(&opts.AlphaFlags, "extra-alpha-flags", "",
cmd.PersistentFlags().StringVar(&opts.AlphaFlags, "extra_alpha_flags", "",
"extra flags for alphas.")
cmd.PersistentFlags().StringVar(&opts.ZeroFlags, "extra-zero-flags", "",
cmd.PersistentFlags().StringVar(&opts.ZeroFlags, "extra_zero_flags", "",
"extra flags for zeros.")
cmd.PersistentFlags().BoolVar(&opts.ContainerNames, "names", true,
"set container names in docker compose.")
cmd.PersistentFlags().StringArrayVar(&opts.AlphaVolumes, "alpha-volume", nil,
cmd.PersistentFlags().StringArrayVar(&opts.AlphaVolumes, "alpha_volume", nil,
"alpha volume mounts, following srcdir:dstdir[:ro]")
cmd.PersistentFlags().StringArrayVar(&opts.ZeroVolumes, "zero-volume", nil,
cmd.PersistentFlags().StringArrayVar(&opts.ZeroVolumes, "zero_volume", nil,
"zero volume mounts, following srcdir:dstdir[:ro]")
cmd.PersistentFlags().StringArrayVar(&opts.AlphaEnvFile, "alpha-env-file", nil,
cmd.PersistentFlags().StringArrayVar(&opts.AlphaEnvFile, "alpha_env_file", nil,
"env_file for alpha")
cmd.PersistentFlags().StringArrayVar(&opts.ZeroEnvFile, "zero-env-file", nil,
cmd.PersistentFlags().StringArrayVar(&opts.ZeroEnvFile, "zero_env_file", nil,
"env_file for zero")
cmd.PersistentFlags().BoolVar(&opts.Minio, "minio", false,
"include minio service")
cmd.PersistentFlags().Uint16Var(&opts.MinioPort, "minio-port", 9001,
cmd.PersistentFlags().Uint16Var(&opts.MinioPort, "minio_port", 9001,
"minio service port")
cmd.PersistentFlags().StringArrayVar(&opts.MinioEnvFile, "minio-env-file", nil,
cmd.PersistentFlags().StringArrayVar(&opts.MinioEnvFile, "minio_env_file", nil,
"minio service env_file")
err := cmd.ParseFlags(os.Args)
if err != nil {
Expand All @@ -629,13 +628,13 @@ func main() {
fatal(errors.Errorf("number of replicas must be odd"))
}
if opts.DataVol && opts.DataDir != "" {
fatal(errors.Errorf("only one of --data-vol and --data-dir may be used at a time"))
fatal(errors.Errorf("only one of --data_vol and --data_dir may be used at a time"))
}
if opts.UserOwnership && opts.DataDir == "" {
fatal(errors.Errorf("--user option requires --data-dir=<path>"))
fatal(errors.Errorf("--user option requires --data_dir=<path>"))
}
if cmd.Flags().Changed("ratel-port") && !opts.Ratel {
fatal(errors.Errorf("--ratel-port option requires --ratel"))
if cmd.Flags().Changed("ratel_port") && !opts.Ratel {
fatal(errors.Errorf("--ratel_port option requires --ratel"))
}

services := make(map[string]service)
Expand Down
1 change: 1 addition & 0 deletions compose/run.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,5 @@ Info "rebuilding dgraph ..."
# The up command handles that automatically

Info "bringing up containers"
docker-compose -p dgraph down
docker-compose --compatibility -p dgraph up --force-recreate --remove-orphans
27 changes: 14 additions & 13 deletions dgraph/cmd/alpha/http_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ func runGzipWithRetry(contentType, url string, buf io.Reader, gzReq, gzResp bool
return nil, err
}
req.Header.Add("Content-Type", contentType)
req.Header.Set("X-Dgraph-AccessToken", grootAccessJwt)
req.Header.Set("X-Dgraph-AccessToken", token.AccessJwt)

if gzReq {
req.Header.Set("Content-Encoding", "gzip")
Expand All @@ -79,14 +79,15 @@ func runGzipWithRetry(contentType, url string, buf io.Reader, gzReq, gzResp bool

resp, err = client.Do(req)
if err != nil && strings.Contains(err.Error(), "Token is expired") {
grootAccessJwt, grootRefreshJwt, err = testutil.HttpLogin(&testutil.LoginParams{
newToken, err := testutil.HttpLogin(&testutil.LoginParams{
Endpoint: addr + "/admin",
RefreshJwt: grootRefreshJwt,
RefreshJwt: token.RefreshToken,
})

if err != nil {
return nil, err
}
token.AccessJwt = newToken.AccessJwt
token.RefreshToken = newToken.RefreshToken
continue
} else if err != nil {
return nil, err
Expand Down Expand Up @@ -303,9 +304,9 @@ func runWithRetries(method, contentType, url string, body string) (

qr, respBody, err := runRequest(req)
if err != nil && strings.Contains(err.Error(), "Token is expired") {
grootAccessJwt, grootRefreshJwt, err = testutil.HttpLogin(&testutil.LoginParams{
token, err = testutil.HttpLogin(&testutil.LoginParams{
Endpoint: addr + "/admin",
RefreshJwt: grootRefreshJwt,
RefreshJwt: token.RefreshToken,
})
if err != nil {
return nil, nil, err
Expand All @@ -325,7 +326,7 @@ func runWithRetries(method, contentType, url string, body string) (
// attach the grootAccessJWT to the request and sends the http request
func runRequest(req *http.Request) (*x.QueryResWithData, []byte, error) {
client := &http.Client{}
req.Header.Set("X-Dgraph-AccessToken", grootAccessJwt)
req.Header.Set("X-Dgraph-AccessToken", token.AccessJwt)
resp, err := client.Do(req)
if err != nil {
return nil, nil, err
Expand Down Expand Up @@ -358,9 +359,9 @@ func runWithRetriesForResp(method, contentType, url string, body string) (

qr, respBody, resp, err := runRequestForResp(req)
if err != nil && strings.Contains(err.Error(), "Token is expired") {
grootAccessJwt, grootRefreshJwt, err = testutil.HttpLogin(&testutil.LoginParams{
token, err = testutil.HttpLogin(&testutil.LoginParams{
Endpoint: addr + "/admin",
RefreshJwt: grootRefreshJwt,
RefreshJwt: token.RefreshToken,
})
if err != nil {
return nil, nil, nil, err
Expand All @@ -380,7 +381,7 @@ func runWithRetriesForResp(method, contentType, url string, body string) (
// attach the grootAccessJWT to the request and sends the http request
func runRequestForResp(req *http.Request) (*x.QueryResWithData, []byte, *http.Response, error) {
client := &http.Client{}
req.Header.Set("X-Dgraph-AccessToken", grootAccessJwt)
req.Header.Set("X-Dgraph-AccessToken", token.AccessJwt)
resp, err := client.Do(req)
if err != nil {
return nil, nil, resp, err
Expand Down Expand Up @@ -922,12 +923,12 @@ func TestDrainingMode(t *testing.T) {

}

grootJwt, _ := testutil.GrootHttpLogin(addr + "/admin")
token := testutil.GrootHttpLogin(addr + "/admin")

setDrainingMode(t, true, grootJwt)
setDrainingMode(t, true, token.AccessJwt)
runRequests(true)

setDrainingMode(t, false, grootJwt)
setDrainingMode(t, false, token.AccessJwt)
runRequests(false)
}

Expand Down
Loading

0 comments on commit 7cb96d8

Please sign in to comment.