Merge pull request #460 from nats-io/fix_filestore_init

[FIXED] FileStore.Init() implementation

stores/common_test.go

@@ -1,4 +1,5 @@
 // Copyright 2016-2017 Apcera Inc. All rights reserved.
+// Copyright 2018 Synadia Communications Inc. All rights reserved.
 
 package stores
 
@@ -420,7 +421,24 @@ func TestCSInit(t *testing.T) {
 		t.Run(st.name, func(t *testing.T) {
 			t.Parallel()
 			defer endTest(t, st)
-			s := startTest(t, st)
+
+			var (
+				s   Store
+				err error
+			)
+			switch st.name {
+			case TypeMemory:
+				s, err = NewMemoryStore(testLogger, nil)
+			case TypeFile:
+				s, err = NewFileStore(testLogger, testFSDefaultDatastore, nil)
+			case TypeSQL:
+				s, err = NewSQLStore(testLogger, testSQLDriver, testSQLSource, nil)
+			default:
+				panic(fmt.Errorf("Add store type %q in this test", st.name))
+			}
+			if err != nil {
+				t.Fatalf("Error creating store: %v", err)
+			}
 			defer s.Close()
 
 			info := spb.ServerInfo{

stores/filestore.go

@@ -1,4 +1,5 @@
 // Copyright 2016-2017 Apcera Inc. All rights reserved.
+// Copyright 2018 Synadia Communications Inc. All rights reserved.
 
 package stores
 
@@ -1420,8 +1421,18 @@ func (fs *FileStore) Init(info *spb.ServerInfo) error {
 	fs.Lock()
 	defer fs.Unlock()
 
-	if _, err := fs.fm.lockFile(fs.serverFile); err != nil {
-		return err
+	if fs.serverFile == nil {
+		var err error
+		// Open/Create the server file (note that this file must not be opened,
+		// in APPEND mode to allow truncate to work).
+		fs.serverFile, err = fs.fm.createFile(serverFileName, os.O_RDWR|os.O_CREATE, nil)
+		if err != nil {
+			return err
+		}
+	} else {
+		if _, err := fs.fm.lockFile(fs.serverFile); err != nil {
+			return err
+		}
 	}
 	f := fs.serverFile.handle
 	// defer is ok for this function...