85a5c358d8
- Adds an interface to update in-memory bucket metadata state called
BucketMetaState - this interface has functions to:
- update bucket notification configuration,
- bucket listener configuration,
- bucket policy configuration, and
- send bucket event
- This interface is implemented by `localBMS` a type for manipulating
local node in-memory bucket metadata, and by `remoteBMS` a type for
manipulating remote node in-memory bucket metadata.
- The remote node interface, makes an RPC call, but the local node
interface does not - it updates in-memory bucket state directly.
- Rename mkPeersFromEndpoints to makeS3Peers and refactored it.
- Use arrayslice instead of map in s3Peers struct
- `s3Peers.SendUpdate` now receives an arrayslice of peer indexes to
send the request to, with a special nil value slice indicating that
all peers should be sent the update.
- `s3Peers.SendUpdate` now returns an arrayslice of errors, representing
errors from peers when sending an update. The array positions
correspond to peer array s3Peers.peers
Improve globalS3Peers:
- Make isDistXL a global `globalIsDistXL` and remove from s3Peers
- Make globalS3Peers an array of (address, bucket-meta-state) pairs.
- Fix code and tests.
90 lines
2 KiB
Go
90 lines
2 KiB
Go
/*
|
|
* Minio Cloud Storage, (C) 2016 Minio, Inc.
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
package cmd
|
|
|
|
import (
|
|
"fmt"
|
|
"io/ioutil"
|
|
"net/rpc"
|
|
|
|
"github.com/Sirupsen/logrus"
|
|
)
|
|
|
|
type listenerConn struct {
|
|
TargetAddr string
|
|
ListenerARN string
|
|
BMSClient BucketMetaState
|
|
}
|
|
|
|
type listenerLogger struct {
|
|
log *logrus.Logger
|
|
lconn listenerConn
|
|
}
|
|
|
|
func newListenerLogger(listenerArn, targetAddr string) (*listenerLogger, error) {
|
|
bmsClient := globalS3Peers.GetPeerClient(targetAddr)
|
|
if bmsClient == nil {
|
|
return nil, fmt.Errorf(
|
|
"Peer %s was not initialized - bug!",
|
|
targetAddr,
|
|
)
|
|
}
|
|
lc := listenerConn{
|
|
TargetAddr: targetAddr,
|
|
ListenerARN: listenerArn,
|
|
BMSClient: bmsClient,
|
|
}
|
|
|
|
lcLog := logrus.New()
|
|
|
|
lcLog.Out = ioutil.Discard
|
|
|
|
lcLog.Formatter = new(logrus.JSONFormatter)
|
|
|
|
lcLog.Hooks.Add(lc)
|
|
|
|
return &listenerLogger{lcLog, lc}, nil
|
|
}
|
|
|
|
// send event to target server via rpc client calls.
|
|
func (lc listenerConn) Fire(entry *logrus.Entry) error {
|
|
notificationEvent, ok := entry.Data["Records"].([]NotificationEvent)
|
|
if !ok {
|
|
// If the record is not of the expected type, silently
|
|
// discard.
|
|
return nil
|
|
}
|
|
|
|
// Send Event RPC call and return error
|
|
arg := EventArgs{Event: notificationEvent, Arn: lc.ListenerARN}
|
|
err := lc.BMSClient.SendEvent(&arg)
|
|
|
|
// In case connection is shutdown, retry once.
|
|
if err != nil {
|
|
if err.Error() == rpc.ErrShutdown.Error() {
|
|
err = lc.BMSClient.SendEvent(&arg)
|
|
}
|
|
}
|
|
return err
|
|
}
|
|
|
|
func (lc listenerConn) Levels() []logrus.Level {
|
|
return []logrus.Level{
|
|
logrus.InfoLevel,
|
|
}
|
|
}
|