diff --git a/tools/etcd-dump-logs/expectedoutput/decoder_correctoutputformat.output b/tools/etcd-dump-logs/expectedoutput/decoder_correctoutputformat.output index 158139d6b51..1937054cad0 100644 --- a/tools/etcd-dump-logs/expectedoutput/decoder_correctoutputformat.output +++ b/tools/etcd-dump-logs/expectedoutput/decoder_correctoutputformat.output @@ -12,7 +12,7 @@ term index type data decoder_status decoded_data 2 4 conf method=ConfChangeAddLearnerNode id=3 ERROR jhjdajjcahjcbbjj 3 5 norm noop OK jhjjabjjaajfbfgjfagdfhcjbbahgbbbfhfegibbcabbfhffbbbcbbfhfibbcaebbbgiffbbedgdbhjacbjjchjjdjjjdhjiejjjehjafjjjfhjjgjjjghjahjjajjhhjajj 3 6 norm method=QGET path="/path1" OK jhjaabjdeadgdeedaajfbfgjfagdfhcabbacgbbbcjbbcabbcabbbcbbcbbbcaebbbccbbedgdbhjjcbjjchjjdjjjdhjiejjjehjafjjjfhjjgjjjghjahjjajjhhjajj - 3 7 norm method=SYNC time="1969-12-31 16:00:00.000000001 -0800 PST" OK jhjbabjdeceidedcaajfbfgjfagdfhcbbbacgbbbcjbbcabbcabbbcbbcbbbcaebbbccbbedgdbhjjcbjjchjjdjjjdhjbejjjehjafjjjfhjjgjjjghjahjjajjhhjajj + 3 7 norm method=SYNC time="1970-01-01 00:00:00.000000001 +0000 UTC" OK jhjbabjdeceidedcaajfbfgjfagdfhcbbbacgbbbcjbbcabbcabbbcbbcbbbcaebbbccbbedgdbhjjcbjjchjjdjjjdhjbejjjehjafjjjfhjjgjjjghjahjjajjhhjajj 3 8 norm method=DELETE path="/path3" OK jhjcabjfdddedcdeeddeaajfbfgjfagdfhccbbahgbbbfhfegibbcabbfhffbbbcbbfhfibbcaebbbgiffbbedgdbhjjcbjjchjjdjjadhjbejjjehjafjjjfhjjgjjjghjahjjajjhhjajj 3 9 norm method=RANDOM path="/path4/superlong/path/path/path/path/path/path/path/path/path/pa"..."path/path/path/path/path/path/path/path/path/path/path/path/path" val="{\"hey\":\"ho\",\"hi\":[\"yo\"]}" OK jhjdabjfebdadedddfddaaafjabfgjfagdfhcdbfgcgegjfegbfcfffefgbfgjfagdfhbfgjfagdfhbfgjfagdfhbfgjfagdfhbfgjfagdfhbfgjfagdfhbfgjfagdfhbfgjfagdfhbfgjfagdfhbfgjfagdfhbfgjfagdfhbfgjfagdfhbfgjfagdfhbfgjfagdfhbfgjfagdfhbfgjfagdfhbfgjfagdfhbfgjfagdfhbfgjfagdfhbfgjfagdfhbfgjfagdfhbfgjfagdfhbfgjfagdfhbfgjfagdfhbfgjfagdfhbfgjfagdfhbfgjfagdfhbfgjfagdfhbfgjfagdfhbfgjfagdfhbbahgbbbfhfegibbcabbfhffbbbcbbfhfibbcaebbbgiffbbedgdbhjjcbjjchjjdjjjdhjbejjjehjafjjjfhjjgjjjghjahjjajjhhjajj 4 10 norm ID:5 range: OK jhjeaaaejajacaabjbfhfiahjfbjjabhjaehajicjafhajicja diff --git a/tools/etcd-dump-logs/expectedoutput/decoder_wrongoutputformat.output b/tools/etcd-dump-logs/expectedoutput/decoder_wrongoutputformat.output index bcb0c742d5d..90341eb62c1 100644 --- a/tools/etcd-dump-logs/expectedoutput/decoder_wrongoutputformat.output +++ b/tools/etcd-dump-logs/expectedoutput/decoder_wrongoutputformat.output @@ -12,7 +12,7 @@ term index type data decoder_status decoded_data 2 4 conf method=ConfChangeAddLearnerNode id=3 decoder output format is not right, print output anyway jhjdajjcahjcbbjj 3 5 norm noop decoder output format is not right, print output anyway jhjjabjjaajfbfgjfagdfhcjbbahgbbbfhfegibbcabbfhffbbbcbbfhfibbcaebbbgiffbbedgdbhjacbjjchjjdjjjdhjiejjjehjafjjjfhjjgjjjghjahjjajjhhjajj 3 6 norm method=QGET path="/path1" decoder output format is not right, print output anyway jhjaabjdeadgdeedaajfbfgjfagdfhcabbacgbbbcjbbcabbcabbbcbbcbbbcaebbbccbbedgdbhjjcbjjchjjdjjjdhjiejjjehjafjjjfhjjgjjjghjahjjajjhhjajj - 3 7 norm method=SYNC time="1969-12-31 16:00:00.000000001 -0800 PST" decoder output format is not right, print output anyway jhjbabjdeceidedcaajfbfgjfagdfhcbbbacgbbbcjbbcabbcabbbcbbcbbbcaebbbccbbedgdbhjjcbjjchjjdjjjdhjbejjjehjafjjjfhjjgjjjghjahjjajjhhjajj + 3 7 norm method=SYNC time="1970-01-01 00:00:00.000000001 +0000 UTC" decoder output format is not right, print output anyway jhjbabjdeceidedcaajfbfgjfagdfhcbbbacgbbbcjbbcabbcabbbcbbcbbbcaebbbccbbedgdbhjjcbjjchjjdjjjdhjbejjjehjafjjjfhjjgjjjghjahjjajjhhjajj 3 8 norm method=DELETE path="/path3" decoder output format is not right, print output anyway jhjcabjfdddedcdeeddeaajfbfgjfagdfhccbbahgbbbfhfegibbcabbfhffbbbcbbfhfibbcaebbbgiffbbedgdbhjjcbjjchjjdjjadhjbejjjehjafjjjfhjjgjjjghjahjjajjhhjajj 3 9 norm method=RANDOM path="/path4/superlong/path/path/path/path/path/path/path/path/path/pa"..."path/path/path/path/path/path/path/path/path/path/path/path/path" val="{\"hey\":\"ho\",\"hi\":[\"yo\"]}" decoder output format is not right, print output anyway jhjdabjfebdadedddfddaaafjabfgjfagdfhcdbfgcgegjfegbfcfffefgbfgjfagdfhbfgjfagdfhbfgjfagdfhbfgjfagdfhbfgjfagdfhbfgjfagdfhbfgjfagdfhbfgjfagdfhbfgjfagdfhbfgjfagdfhbfgjfagdfhbfgjfagdfhbfgjfagdfhbfgjfagdfhbfgjfagdfhbfgjfagdfhbfgjfagdfhbfgjfagdfhbfgjfagdfhbfgjfagdfhbfgjfagdfhbfgjfagdfhbfgjfagdfhbfgjfagdfhbfgjfagdfhbfgjfagdfhbfgjfagdfhbfgjfagdfhbfgjfagdfhbfgjfagdfhbbahgbbbfhfegibbcabbfhffbbbcbbfhfibbcaebbbgiffbbedgdbhjjcbjjchjjdjjjdhjbejjjehjafjjjfhjjgjjjghjahjjajjhhjajj 4 10 norm ID:5 range: decoder output format is not right, print output anyway jhjeaaaejajacaabjbfhfiahjfbjjabhjaehajicjafhajicja diff --git a/tools/etcd-dump-logs/expectedoutput/listAll.output b/tools/etcd-dump-logs/expectedoutput/listAll.output index fbf57a08fbe..3a6f41bb9c9 100644 --- a/tools/etcd-dump-logs/expectedoutput/listAll.output +++ b/tools/etcd-dump-logs/expectedoutput/listAll.output @@ -12,7 +12,7 @@ term index type data 2 4 conf method=ConfChangeAddLearnerNode id=3 3 5 norm noop 3 6 norm method=QGET path="/path1" - 3 7 norm method=SYNC time="1969-12-31 16:00:00.000000001 -0800 PST" + 3 7 norm method=SYNC time="1970-01-01 00:00:00.000000001 +0000 UTC" 3 8 norm method=DELETE path="/path3" 3 9 norm method=RANDOM path="/path4/superlong/path/path/path/path/path/path/path/path/path/pa"..."path/path/path/path/path/path/path/path/path/path/path/path/path" val="{\"hey\":\"ho\",\"hi\":[\"yo\"]}" 4 10 norm ID:5 range: diff --git a/tools/etcd-dump-logs/expectedoutput/listNormal.output b/tools/etcd-dump-logs/expectedoutput/listNormal.output index 60759bca574..37a1bb80cd6 100644 --- a/tools/etcd-dump-logs/expectedoutput/listNormal.output +++ b/tools/etcd-dump-logs/expectedoutput/listNormal.output @@ -8,7 +8,7 @@ lastIndex=34 term index type data 3 5 norm noop 3 6 norm method=QGET path="/path1" - 3 7 norm method=SYNC time="1969-12-31 16:00:00.000000001 -0800 PST" + 3 7 norm method=SYNC time="1970-01-01 00:00:00.000000001 +0000 UTC" 3 8 norm method=DELETE path="/path3" 3 9 norm method=RANDOM path="/path4/superlong/path/path/path/path/path/path/path/path/path/pa"..."path/path/path/path/path/path/path/path/path/path/path/path/path" val="{\"hey\":\"ho\",\"hi\":[\"yo\"]}" 4 10 norm ID:5 range: diff --git a/tools/etcd-dump-logs/expectedoutput/listRequest.output b/tools/etcd-dump-logs/expectedoutput/listRequest.output index 938519ff58c..5201ff9d366 100644 --- a/tools/etcd-dump-logs/expectedoutput/listRequest.output +++ b/tools/etcd-dump-logs/expectedoutput/listRequest.output @@ -8,7 +8,7 @@ lastIndex=34 term index type data 3 5 norm noop 3 6 norm method=QGET path="/path1" - 3 7 norm method=SYNC time="1969-12-31 16:00:00.000000001 -0800 PST" + 3 7 norm method=SYNC time="1970-01-01 00:00:00.000000001 +0000 UTC" 3 8 norm method=DELETE path="/path3" 3 9 norm method=RANDOM path="/path4/superlong/path/path/path/path/path/path/path/path/path/pa"..."path/path/path/path/path/path/path/path/path/path/path/path/path" val="{\"hey\":\"ho\",\"hi\":[\"yo\"]}" diff --git a/tools/etcd-dump-logs/main.go b/tools/etcd-dump-logs/main.go index 6d842b2aceb..c59b3c9e2fe 100644 --- a/tools/etcd-dump-logs/main.go +++ b/tools/etcd-dump-logs/main.go @@ -254,7 +254,7 @@ func printRequest(entry raftpb.Entry) { case "": fmt.Printf("\tnoop") case "SYNC": - fmt.Printf("\tmethod=SYNC time=%q", time.Unix(0, r.Time)) + fmt.Printf("\tmethod=SYNC time=%q", time.Unix(0, r.Time).UTC()) case "QGET", "DELETE": fmt.Printf("\tmethod=%s path=%s", r.Method, excerpt(r.Path, 64, 64)) default: