Merge lp:~natefinch/juju-core/042-sortaensure into lp:~go-bot/juju-core/trunk

[Nate Finch]

fix upgrade from 1.18 to 1.19

So, we can't start old mongo servers into replset mode just yet, which was causing the problem. So for now, we won't replace the old upstart scripts of existing servers.

https://codereview.appspot.com/86930046/

[Nate Finch (natefinch)]

Reviewers: mp+215504_code.launchpad.net,

Message:
Please take a look.

Description:
fix upgrade from 1.18 to 1.19

So, we can't start old mongo servers into replset mode just yet, which
was causing the problem. So for now, we won't replace the old upstart
scripts of existing servers.

https://code.launchpad.net/~natefinch/juju-core/042-sortaensure/+merge/215504

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/86930046/

Affected files (+24, -11 lines):
   A [revision details]
   M agent/mongo/mongo.go
   M agent/mongo/mongo_test.go

Index: [revision details]
=== added file '[revision details]'
--- [revision details] 2012-01-01 00:00:00 +0000
+++ [revision details] 2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision: tarmac-20140411112804-lhmoi3eyp2zaqx0g
+New revision: <email address hidden>

Index: agent/mongo/mongo.go
=== modified file 'agent/mongo/mongo.go'
--- agent/mongo/mongo.go 2014-04-10 09:58:05 +0000
+++ agent/mongo/mongo.go 2014-04-11 19:48:39 +0000
@@ -186,7 +186,6 @@
  // the local provider.
  func EnsureMongoServer(dataDir string, port int, namespace string) error {
   // NOTE: ensure that the right package is installed?
-
   logger.Infof("Ensuring mongo server is running; dataDir %s; port %d",
dataDir, port)
   dbDir := filepath.Join(dataDir, "db")

@@ -194,6 +193,12 @@
   if err != nil {
    return err
   }
+
+ // TODO(natefinch): remove this once we support upgrading to HA
+ if service.Installed() {
+ return nil
+ }
+
   if err := makeJournalDirs(dbDir); err != nil {
    return fmt.Errorf("Error creating journal directories: %v", err)
   }
@@ -222,7 +227,11 @@
   for x := 0; x < 3; x++ {
    name := fmt.Sprintf("prealloc.%d", x)
    filename := filepath.Join(journalDir, name)
- f, err := os.OpenFile(filename, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0700)
+ f, err := os.OpenFile(filename, os.O_WRONLY|os.O_CREATE|os.O_EXCL, 0700)
+ if os.IsExist(err) {
+ // already exists, don't overwrite
+ continue
+ }
    if err != nil {
     return fmt.Errorf("failed to open mongo prealloc file %q: %v",
filename, err)
    }

Index: agent/mongo/mongo_test.go
=== modified file 'agent/mongo/mongo_test.go'
--- agent/mongo/mongo_test.go 2014-04-08 15:04:46 +0000
+++ agent/mongo/mongo_test.go 2014-04-11 19:48:39 +0000
@@ -81,19 +81,19 @@
  func testJournalDirs(dir string, c *gc.C) {
   journalDir := path.Join(dir, "journal")

- c.Check(journalDir, jc.IsDirectory)
+ c.Assert(journalDir, jc.IsDirectory)
   info, err := os.Stat(filepath.Join(journalDir, "prealloc.0"))
- c.Check(err, gc.IsNil)
+ c.Assert(err, gc.IsNil)

   size := int64(1024 * 1024)

- c.Check(info.Size(), gc.Equals, size)
+ c.Assert(info.Size(), gc.Equals, size)
   info, err = os.Stat(filepath.Join(journalDir, "prealloc.1"))
- c.Check(err, gc.IsNil)
- c.Check(info.Size(), gc.Equals, size)
+ c.Assert(err, gc.IsNil)
+ c.Assert(info.Size(), gc.Equals, size)
   info, err = os.Stat(filepath.Join(journalDir, "prealloc.2"))
- c.Check(err, gc.IsNil)
- c.Check(info.Size(), gc.Equals, size)
+ c.Assert(err, gc.IsNil)
+ c.Assert(info.Size(), gc.Equals, size)
  }

  func (s *MongoSuite) TestEn...

[Ian Booth (wallyworld)]

LGTM with another TODO added

https://codereview.appspot.com/86930046/diff/1/agent/mongo/mongo.go
File agent/mongo/mongo.go (right):

https://codereview.appspot.com/86930046/diff/1/agent/mongo/mongo.go#newcode231
agent/mongo/mongo.go:231: if os.IsExist(err) {
Can we add a TODO here as well please since I think this exists check is
only temporary.

https://codereview.appspot.com/86930046/

[John A Meinel (jameinel)]

Just to be clear, the "We can't upgrade" is because we have to do the
mongo-single-user song-and-dance to get API servers admin rights to be
able to configure the replica set details, is that correct?

If so, LGTM

https://codereview.appspot.com/86930046/

[Roger Peppe (rogpeppe)]

Yes
On 12 Apr 2014 06:31, "John A Meinel" <email address hidden> wrote:

> Just to be clear, the "We can't upgrade" is because we have to do the
> mongo-single-user song-and-dance to get API servers admin rights to be
> able to configure the replica set details, is that correct?
>
> If so, LGTM
>
> https://codereview.appspot.com/86930046/
>
> --
>
> https://code.launchpad.net/~natefinch/juju-core/042-sortaensure/+merge/215504
> Your team juju hackers is requested to review the proposed merge of
> lp:~natefinch/juju-core/042-sortaensure into lp:juju-core.
>

[John A Meinel (jameinel)]

I went ahead and added a TODO comment, and linked it to a Launchpad bug.

=== modified file 'agent/mongo/mongo.go'
--- agent/mongo/mongo.go	2014-04-10 09:58:05 +0000
+++ agent/mongo/mongo.go	2014-04-11 20:52:24 +0000
@@ -186,7 +186,6 @@
 // the local provider.
 func EnsureMongoServer(dataDir string, port int, namespace string) error {
 	// NOTE: ensure that the right package is installed?
-
 	logger.Infof("Ensuring mongo server is running; dataDir %s; port %d", dataDir, port)
 	dbDir := filepath.Join(dataDir, "db")
 
@@ -194,6 +193,12 @@
 	if err != nil {
 		return err
 	}
+
+	// TODO(natefinch): remove this once we support upgrading to HA
+	if service.Installed() {
+		return nil
+	}
+
 	if err := makeJournalDirs(dbDir); err != nil {
 		return fmt.Errorf("Error creating journal directories: %v", err)
 	}
@@ -222,7 +227,11 @@
 	for x := 0; x < 3; x++ {
 		name := fmt.Sprintf("prealloc.%d", x)
 		filename := filepath.Join(journalDir, name)
-		f, err := os.OpenFile(filename, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0700)
+		f, err := os.OpenFile(filename, os.O_WRONLY|os.O_CREATE|os.O_EXCL, 0700)
+		if os.IsExist(err) {
+			// already exists, don't overwrite
+			continue
+		}
 		if err != nil {
 			return fmt.Errorf("failed to open mongo prealloc file %q: %v", filename, err)
 		}

=== modified file 'agent/mongo/mongo_test.go'
--- agent/mongo/mongo_test.go	2014-04-08 15:04:46 +0000
+++ agent/mongo/mongo_test.go	2014-04-11 20:52:24 +0000
@@ -81,19 +81,19 @@
 func testJournalDirs(dir string, c *gc.C) {
 	journalDir := path.Join(dir, "journal")
 
-	c.Check(journalDir, jc.IsDirectory)
+	c.Assert(journalDir, jc.IsDirectory)
 	info, err := os.Stat(filepath.Join(journalDir, "prealloc.0"))
-	c.Check(err, gc.IsNil)
+	c.Assert(err, gc.IsNil)
 
 	size := int64(1024 * 1024)
 
-	c.Check(info.Size(), gc.Equals, size)
+	c.Assert(info.Size(), gc.Equals, size)
 	info, err = os.Stat(filepath.Join(journalDir, "prealloc.1"))
-	c.Check(err, gc.IsNil)
-	c.Check(info.Size(), gc.Equals, size)
+	c.Assert(err, gc.IsNil)
+	c.Assert(info.Size(), gc.Equals, size)
 	info, err = os.Stat(filepath.Join(journalDir, "prealloc.2"))
-	c.Check(err, gc.IsNil)
-	c.Check(info.Size(), gc.Equals, size)
+	c.Assert(err, gc.IsNil)
+	c.Assert(info.Size(), gc.Equals, size)
 }
 
 func (s *MongoSuite) TestEnsureMongoServer(c *gc.C) {
@@ -101,8 +101,10 @@
 	dbDir := filepath.Join(dir, "db")
 	port := 25252
 	namespace := "namespace"
-	oldsvc := makeService(ServiceName(namespace), c)
-	defer oldsvc.StopAndRemove()
+
+	// TODO(natefinch): uncomment when we support upgrading to HA
+	//oldsvc := makeService(ServiceName(namespace), c)
+	//defer oldsvc.StopAndRemove()
 
 	err := EnsureMongoServer(dir, port, namespace)
 	c.Assert(err, gc.IsNil)