Skip to content

Commit

Permalink
Fix comments
Browse files Browse the repository at this point in the history
  • Loading branch information
jwilder committed Apr 21, 2015
1 parent 1df9c76 commit 3b3575e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
4 changes: 3 additions & 1 deletion cmd/influxd/run.go
Original file line number Diff line number Diff line change
Expand Up @@ -651,7 +651,8 @@ func (cmd *RunCommand) openServer(joinURLs []url.URL) *influxdb.Server {
return s
}

// joinOrInitializeServer a server to an existing cluster or initializes.
// joinOrInitializeServer joins a new server to an existing cluster or initializes it as the first
// member of the cluster
func joinOrInitializeServer(s *influxdb.Server, u url.URL, joinURLs []url.URL) {
// Create data node on an existing data node.
for _, joinURL := range joinURLs {
Expand All @@ -663,6 +664,7 @@ func joinOrInitializeServer(s *influxdb.Server, u url.URL, joinURLs []url.URL) {
log.Printf("initialized data node: %s\n", (&u).String())
return
} else if err != nil {
// does not return so that the next joinURL can be tried
log.Printf("join: failed to connect data node: %s: %s", (&u).String(), err)
} else {
log.Printf("join: connected data node to %s", u)
Expand Down
2 changes: 1 addition & 1 deletion influxql/engine.go
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ func (m *MapReduceJob) processRawQuery(out chan *Row, filterEmptyResults bool) {
// add up to the index to the values
values = append(values, o[:ind]...)

// clear out previously send mapper output data
// clear out previously sent mapper output data
mapperOutputs[j] = mapperOutputs[j][ind:]

// if we emptied out all the values, set this output to nil so that the mapper will get run again on the next loop
Expand Down

0 comments on commit 3b3575e

Please sign in to comment.