Browse code
doc: fix typo
Signed-off-by: Yan Zhu <yanzhu@alauda.io>
Yan Zhu authored on 2018/09/07 12:43:42Showing 6 changed files
- libnetwork/bitseq/sequence.go
- libnetwork/cmd/networkdb-test/dbclient/ndbClient.go
- libnetwork/diagnostic/server.go
- libnetwork/osl/interface_linux.go
- libnetwork/osl/namespace_linux.go
- libnetwork/test/integration/dnet/helpers.bash
| ... | ... |
@@ -32,7 +32,7 @@ var ( |
| 32 | 32 |
ErrBitAllocated = errors.New("requested bit is already allocated")
|
| 33 | 33 |
) |
| 34 | 34 |
|
| 35 |
-// Handle contains the sequece representing the bitmask and its identifier |
|
| 35 |
+// Handle contains the sequence representing the bitmask and its identifier |
|
| 36 | 36 |
type Handle struct {
|
| 37 | 37 |
bits uint64 |
| 38 | 38 |
unselected uint64 |
| ... | ... |
@@ -368,9 +368,9 @@ func doClusterPeers(ips []string, args []string) {
|
| 368 | 368 |
if node.result != expectedPeers {
|
| 369 | 369 |
failed = true |
| 370 | 370 |
if retry == maxRetry-1 {
|
| 371 |
- log.Fatalf("Expected peers from %s missmatch %d != %d", node.id, expectedPeers, node.result)
|
|
| 371 |
+ log.Fatalf("Expected peers from %s mismatch %d != %d", node.id, expectedPeers, node.result)
|
|
| 372 | 372 |
} else {
|
| 373 |
- logrus.Warnf("Expected peers from %s missmatch %d != %d", node.id, expectedPeers, node.result)
|
|
| 373 |
+ logrus.Warnf("Expected peers from %s mismatch %d != %d", node.id, expectedPeers, node.result)
|
|
| 374 | 374 |
} |
| 375 | 375 |
time.Sleep(1 * time.Second) |
| 376 | 376 |
} |
| ... | ... |
@@ -429,9 +429,9 @@ func doNetworkPeers(ips []string, args []string) {
|
| 429 | 429 |
if node.result != expectedPeers {
|
| 430 | 430 |
failed = true |
| 431 | 431 |
if retry == maxRetry-1 {
|
| 432 |
- log.Fatalf("Expected peers from %s missmatch %d != %d", node.id, expectedPeers, node.result)
|
|
| 432 |
+ log.Fatalf("Expected peers from %s mismatch %d != %d", node.id, expectedPeers, node.result)
|
|
| 433 | 433 |
} else {
|
| 434 |
- logrus.Warnf("Expected peers from %s missmatch %d != %d", node.id, expectedPeers, node.result)
|
|
| 434 |
+ logrus.Warnf("Expected peers from %s mismatch %d != %d", node.id, expectedPeers, node.result)
|
|
| 435 | 435 |
} |
| 436 | 436 |
time.Sleep(1 * time.Second) |
| 437 | 437 |
} |
| ... | ... |
@@ -95,7 +95,7 @@ func (s *Server) EnableDiagnostic(ip string, port int) {
|
| 95 | 95 |
s.srv = srv |
| 96 | 96 |
s.enable = 1 |
| 97 | 97 |
go func(n *Server) {
|
| 98 |
- // Ingore ErrServerClosed that is returned on the Shutdown call |
|
| 98 |
+ // Ignore ErrServerClosed that is returned on the Shutdown call |
|
| 99 | 99 |
if err := srv.ListenAndServe(); err != nil && err != http.ErrServerClosed {
|
| 100 | 100 |
logrus.Errorf("ListenAndServe error: %s", err)
|
| 101 | 101 |
atomic.SwapInt32(&n.enable, 0) |
| ... | ... |
@@ -297,7 +297,7 @@ func (n *networkNamespace) AddInterface(srcName, dstPrefix string, options ...If |
| 297 | 297 |
logrus.Errorf("renaming interface (%s->%s) failed, %v after config error %v", i.DstName(), i.SrcName(), nerr, err)
|
| 298 | 298 |
} |
| 299 | 299 |
if nerr := nlh.LinkSetNsFd(iface, ns.ParseHandlerInt()); nerr != nil {
|
| 300 |
- logrus.Errorf("moving inteface %s to host ns failed, %v, after config error %v", i.SrcName(), nerr, err)
|
|
| 300 |
+ logrus.Errorf("moving interface %s to host ns failed, %v, after config error %v", i.SrcName(), nerr, err)
|
|
| 301 | 301 |
} |
| 302 | 302 |
return err |
| 303 | 303 |
} |
| ... | ... |
@@ -227,7 +227,7 @@ func NewSandbox(key string, osCreate, isRestore bool) (Sandbox, error) {
|
| 227 | 227 |
logrus.Warnf("Failed to set the timeout on the sandbox netlink handle sockets: %v", err)
|
| 228 | 228 |
} |
| 229 | 229 |
// In live-restore mode, IPV6 entries are getting cleaned up due to below code |
| 230 |
- // We should retain IPV6 configrations in live-restore mode when Docker Daemon |
|
| 230 |
+ // We should retain IPV6 configurations in live-restore mode when Docker Daemon |
|
| 231 | 231 |
// comes back. It should work as it is on other cases |
| 232 | 232 |
// As starting point, disable IPv6 on all interfaces |
| 233 | 233 |
if !isRestore && !n.isDefault {
|
| ... | ... |
@@ -332,7 +332,7 @@ function test_overlay() {
|
| 332 | 332 |
|
| 333 | 333 |
start=1 |
| 334 | 334 |
end=3 |
| 335 |
- # Setup overlay network and connect containers ot it |
|
| 335 |
+ # Setup overlay network and connect containers to it |
|
| 336 | 336 |
if [ -z "${2}" -o "${2}" != "skip_add" ]; then
|
| 337 | 337 |
if [ -z "${2}" -o "${2}" != "internal" ]; then
|
| 338 | 338 |
dnet_cmd $(inst_id2port 1) network create -d overlay multihost |
| ... | ... |
@@ -367,7 +367,7 @@ function test_overlay() {
|
| 367 | 367 |
done |
| 368 | 368 |
done |
| 369 | 369 |
|
| 370 |
- # Setup bridge network and connect containers ot it |
|
| 370 |
+ # Setup bridge network and connect containers to it |
|
| 371 | 371 |
if [ -z "${2}" -o "${2}" != "skip_add" ]; then
|
| 372 | 372 |
if [ -z "${2}" -o "${2}" != "internal" ]; then
|
| 373 | 373 |
dnet_cmd $(inst_id2port 1) network create -d bridge br1 |
| ... | ... |
@@ -445,7 +445,7 @@ function test_overlay_singlehost() {
|
| 445 | 445 |
|
| 446 | 446 |
start=1 |
| 447 | 447 |
end=3 |
| 448 |
- # Setup overlay network and connect containers ot it |
|
| 448 |
+ # Setup overlay network and connect containers to it |
|
| 449 | 449 |
dnet_cmd $(inst_id2port 1) network create -d overlay multihost |
| 450 | 450 |
for i in `seq ${start} ${end}`;
|
| 451 | 451 |
do |
| ... | ... |
@@ -484,7 +484,7 @@ function test_overlay_hostmode() {
|
| 484 | 484 |
|
| 485 | 485 |
start=1 |
| 486 | 486 |
end=2 |
| 487 |
- # Setup overlay network and connect containers ot it |
|
| 487 |
+ # Setup overlay network and connect containers to it |
|
| 488 | 488 |
dnet_cmd $(inst_id2port 1) network create -d overlay multihost1 |
| 489 | 489 |
dnet_cmd $(inst_id2port 1) network create -d overlay multihost2 |
| 490 | 490 |
dnet_cmd $(inst_id2port 1) network ls |