Skip to content

Commit 82350f2

Browse files
committed
update config
1 parent 675cf9d commit 82350f2

File tree

4 files changed

+22
-22
lines changed

4 files changed

+22
-22
lines changed

cmd/common-main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ import (
7272
)
7373

7474
// serverDebugLog will enable debug printing
75-
var serverDebugLog = env.Get("_MINIO_SERVER_DEBUG", config.EnableOff) == config.EnableOn
75+
var serverDebugLog = env.Get("_ANNASTORE_SERVER_DEBUG", config.EnableOff) == config.EnableOn
7676

7777
var (
7878
shardDiskTimeDelta time.Duration

cmd/server-main.go

+14-14
Original file line numberDiff line numberDiff line change
@@ -115,20 +115,20 @@ FLAGS:
115115
{{range .VisibleFlags}}{{.}}
116116
{{end}}{{end}}
117117
EXAMPLES:
118-
1. Start minio server on "/home/shared" directory.
118+
1. Start annastore server on "/home/shared" directory.
119119
{{.Prompt}} {{.HelpName}} /home/shared
120120
121121
2. Start single node server with 64 local drives "/mnt/data1" to "/mnt/data64".
122122
{{.Prompt}} {{.HelpName}} /mnt/data{1...64}
123123
124-
3. Start distributed minio server on an 32 node setup with 32 drives each, run following command on all the nodes
125-
{{.Prompt}} {{.EnvVarSetCommand}} MINIO_ROOT_USER{{.AssignmentOperator}}minio
126-
{{.Prompt}} {{.EnvVarSetCommand}} MINIO_ROOT_PASSWORD{{.AssignmentOperator}}miniostorage
124+
3. Start distributed annastore server on an 32 node setup with 32 drives each, run following command on all the nodes
125+
{{.Prompt}} {{.EnvVarSetCommand}} ANNASTORE_ROOT_USER{{.AssignmentOperator}}annastore
126+
{{.Prompt}} {{.EnvVarSetCommand}} ANNASTORE_ROOT_PASSWORD{{.AssignmentOperator}}annastorestorage
127127
{{.Prompt}} {{.HelpName}} http://node{1...32}.example.com/mnt/export{1...32}
128128
129-
4. Start distributed minio server in an expanded setup, run the following command on all the nodes
130-
{{.Prompt}} {{.EnvVarSetCommand}} MINIO_ROOT_USER{{.AssignmentOperator}}minio
131-
{{.Prompt}} {{.EnvVarSetCommand}} MINIO_ROOT_PASSWORD{{.AssignmentOperator}}miniostorage
129+
4. Start distributed annastore server in an expanded setup, run the following command on all the nodes
130+
{{.Prompt}} {{.EnvVarSetCommand}} ANNASTORE_ROOT_USER{{.AssignmentOperator}}annastore
131+
{{.Prompt}} {{.EnvVarSetCommand}} ANNASTORE_ROOT_PASSWORD{{.AssignmentOperator}}annastorestorage
132132
{{.Prompt}} {{.HelpName}} http://node{1...16}.example.com/mnt/export{1...32} \
133133
http://node{17...64}.example.com/mnt/export{1...64}
134134
`,
@@ -375,7 +375,7 @@ func initServer(ctx context.Context, newObject ObjectLayer) error {
375375
// All successful return.
376376
if globalIsDistErasure {
377377
// These messages only meant primarily for distributed setup, so only log during distributed setup.
378-
logger.Info("All MinIO sub-systems initialized successfully in %s", time.Since(t1))
378+
logger.Info("All AnnaStore sub-systems initialized successfully in %s", time.Since(t1))
379379
}
380380
return nil
381381
}
@@ -385,7 +385,7 @@ func initServer(ctx context.Context, newObject ObjectLayer) error {
385385
txnLk.Unlock(lkctx.Cancel)
386386

387387
if configRetriableErrors(err) {
388-
logger.Info("Waiting for all MinIO sub-systems to be initialized.. possible cause (%v)", err)
388+
logger.Info("Waiting for all AnnaStore sub-systems to be initialized.. possible cause (%v)", err)
389389
time.Sleep(time.Duration(r.Float64() * float64(5*time.Second)))
390390
continue
391391
}
@@ -415,7 +415,7 @@ func initConfigSubsystem(ctx context.Context, newObject ObjectLayer) error {
415415
return nil
416416
}
417417

418-
// serverMain handler called for 'minio server' command.
418+
// serverMain handler called for 'annastore server' command.
419419
func serverMain(ctx *cli.Context) {
420420
signal.Notify(globalOSSignalCh, os.Interrupt, syscall.SIGTERM, syscall.SIGQUIT)
421421

@@ -483,7 +483,7 @@ func serverMain(ctx *cli.Context) {
483483
maxProcs := runtime.GOMAXPROCS(0)
484484
cpuProcs := runtime.NumCPU()
485485
if maxProcs < cpuProcs {
486-
logger.Info(color.RedBold("WARNING: Detected GOMAXPROCS(%d) < NumCPU(%d), please make sure to provide all PROCS to MinIO for optimal performance", maxProcs, cpuProcs))
486+
logger.Info(color.RedBold("WARNING: Detected GOMAXPROCS(%d) < NumCPU(%d), please make sure to provide all PROCS to AnnaStore for optimal performance", maxProcs, cpuProcs))
487487
}
488488

489489
// Configure server.
@@ -542,7 +542,7 @@ func serverMain(ctx *cli.Context) {
542542
initBackgroundExpiry(GlobalContext, newObject)
543543

544544
if globalActiveCred.Equal(auth.DefaultCredentials) {
545-
msg := fmt.Sprintf("WARNING: Detected default credentials '%s', we recommend that you change these values with 'MINIO_ROOT_USER' and 'MINIO_ROOT_PASSWORD' environment variables",
545+
msg := fmt.Sprintf("WARNING: Detected default credentials '%s', we recommend that you change these values with 'ANNASTORE_ROOT_USER' and 'ANNASTORE_ROOT_PASSWORD' environment variables",
546546
globalActiveCred)
547547
logger.Info(color.RedBold(msg))
548548
}
@@ -631,7 +631,7 @@ func serverMain(ctx *cli.Context) {
631631

632632
// initialize the new disk cache objects.
633633
if globalCacheConfig.Enabled {
634-
logger.Info(color.Yellow("WARNING: Drive caching is deprecated for single/multi drive MinIO setups. Please migrate to using MinIO S3 gateway instead of drive caching"))
634+
logger.Info(color.Yellow("WARNING: Drive caching is deprecated for single/multi drive AnnaStore setups. Please migrate to using AnnaStore S3 gateway instead of drive caching"))
635635
var cacheAPI CacheObjectLayer
636636
cacheAPI, err = newServerCacheObjects(GlobalContext, globalCacheConfig)
637637
logger.FatalIf(err, "Unable to initialize drive caching")
@@ -653,7 +653,7 @@ func serverMain(ctx *cli.Context) {
653653
Transport: globalProxyTransport,
654654
Region: region,
655655
})
656-
logger.FatalIf(err, "Unable to initialize MinIO client")
656+
logger.FatalIf(err, "Unable to initialize AnnaStore client")
657657

658658
if serverDebugLog {
659659
logger.Info("== DEBUG Mode enabled ==")

cmd/server-startup-msg.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ func mustGetStorageInfo(objAPI ObjectLayer) StorageInfo {
4444

4545
// Prints the formatted startup message.
4646
func printStartupMessage(apiEndpoints []string, err error) {
47-
logger.Info(color.Bold("MinIO Object Storage Server"))
47+
logger.Info(color.Bold("AnnaStore Object Storage Server"))
4848
if err != nil {
4949
if globalConsoleSys != nil {
5050
globalConsoleSys.Send(fmt.Sprintf("Server startup failed with '%v', some features may be missing", err))
@@ -75,7 +75,7 @@ func printStartupMessage(apiEndpoints []string, err error) {
7575

7676
// Prints `mc` cli configuration message chooses
7777
// first endpoint as default.
78-
printCLIAccessMsg(strippedAPIEndpoints[0], "myminio")
78+
printCLIAccessMsg(strippedAPIEndpoints[0], "mystore")
7979

8080
// Prints documentation message.
8181
printObjectAPIMsg()
@@ -154,7 +154,7 @@ func printServerCommonMsg(apiEndpoints []string) {
154154

155155
// Prints startup message for Object API acces, prints link to our SDK documentation.
156156
func printObjectAPIMsg() {
157-
logger.Info(color.Blue("\nDocumentation: ") + "https://docs.min.io")
157+
logger.Info(color.Blue("\nDocumentation: ") + "https://ciusji.gitbook.io/guinsoolab/products/data-storage/annastore")
158158
}
159159

160160
// Prints bucket notification configurations.
@@ -182,7 +182,7 @@ func printCLIAccessMsg(endPoint string, alias string) {
182182
// Get saved credentials.
183183
cred := globalActiveCred
184184

185-
const mcQuickStartGuide = "https://docs.min.io/docs/minio-client-quickstart-guide"
185+
const mcQuickStartGuide = "https://ciusji.gitbook.io/guinsoolab/products/data-storage/annastore/quickstart/client"
186186

187187
// Configure 'mc', following block prints platform specific information for minio client.
188188
if color.IsTerminal() && !globalCLIContext.Anonymous {

internal/config/config.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ const (
211211
KvDoubleQuote = madmin.KvDoubleQuote
212212
KvSingleQuote = madmin.KvSingleQuote
213213

214-
// Env prefix used for all envs in MinIO
214+
// Env prefix used for all envs in AnnaStore
215215
EnvPrefix = "MINIO_"
216216
EnvWordDelimiter = `_`
217217
)
@@ -571,7 +571,7 @@ func LookupSite(siteKV KVS, regionKV KVS) (s Site, err error) {
571571
// Since the region sub-system cannot be (re)set as it
572572
// is legacy, we return an error to tell the user to
573573
// reset the region via the new command.
574-
err = Errorf("could not load region from legacy configuration as it was invalid - use 'mc admin config set myminio site region=myregion name=myname' to set a region and name (%v)", err)
574+
err = Errorf("could not load region from legacy configuration as it was invalid - use 'mc admin config set mystore site region=myregion name=myname' to set a region and name (%v)", err)
575575
return
576576
}
577577

@@ -617,7 +617,7 @@ func CheckValidKeys(subSys string, kv KVS, validKVS KVS) error {
617617
}
618618
if len(nkv) > 0 {
619619
return Errorf(
620-
"found invalid keys (%s) for '%s' sub-system, use 'mc admin config reset myminio %s' to fix invalid keys", nkv.String(), subSys, subSys)
620+
"found invalid keys (%s) for '%s' sub-system, use 'mc admin config reset mystore %s' to fix invalid keys", nkv.String(), subSys, subSys)
621621
}
622622
return nil
623623
}

0 commit comments

Comments
 (0)