LogDog: Update to archival V2.

common/api/logdog_coordinator/services/v1/service.pb.go

Index: common/api/logdog_coordinator/services/v1/service.pb.go
diff --git a/common/api/logdog_coordinator/services/v1/service.pb.go b/common/api/logdog_coordinator/services/v1/service.pb.go
index 5c28b8e676f6638a92fb85b3bd2fbde16665e7d2..84a579765e791dcd4ca3c67697d3400c1e82e62a 100644
--- a/common/api/logdog_coordinator/services/v1/service.pb.go
+++ b/common/api/logdog_coordinator/services/v1/service.pb.go
@@ -30,6 +30,7 @@ import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
 import logpb "github.com/luci/luci-go/common/proto/logdog/logpb"
+import google_protobuf1 "github.com/luci/luci-go/common/proto/google"
 import google_protobuf2 "github.com/luci/luci-go/common/proto/google"
 
 import (
@@ -133,6 +134,11 @@ type LoadStreamResponse struct {
 	// If requested, the serialized log stream descriptor. The protobuf version
 	// of this descriptor will match the "proto_version" field in "state".
 	Desc []byte `protobuf:"bytes,2,opt,name=desc,proto3" json:"desc,omitempty"`
+	// The age of the log stream.
+	Age *google_protobuf1.Duration `protobuf:"bytes,3,opt,name=age" json:"age,omitempty"`
+	// The archival key of the log stream. If this key doesn't match the key in
+	// the archival request, the request is superfluous and should be deleted.
+	ArchivalKey []byte `protobuf:"bytes,4,opt,name=archival_key,json=archivalKey,proto3" json:"archival_key,omitempty"`
 }
 
 func (m *LoadStreamResponse) Reset()                    { *m = LoadStreamResponse{} }
@@ -147,6 +153,13 @@ func (m *LoadStreamResponse) GetState() *LogStreamState {
 	return nil
 }
 
+func (m *LoadStreamResponse) GetAge() *google_protobuf1.Duration {
+	if m != nil {
+		return m.Age
+	}
+	return nil
+}
+
 // TerminateStreamRequest is the set of caller-supplied data for the
 // TerminateStream service endpoint.
 type TerminateStreamRequest struct {
@@ -168,11 +181,16 @@ func (*TerminateStreamRequest) Descriptor() ([]byte, []int) { return fileDescrip
 type ArchiveStreamRequest struct {
 	// The path of the log stream that was archived.
 	Path string `protobuf:"bytes,1,opt,name=path" json:"path,omitempty"`
-	// If true, the archive includes the full set of log stream entries between
-	// [0..terminal_index].
-	Complete bool `protobuf:"varint,2,opt,name=complete" json:"complete,omitempty"`
+	// The number of log entries that were archived.
+	LogEntryCount int64 `protobuf:"varint,2,opt,name=log_entry_count,json=logEntryCount" json:"log_entry_count,omitempty"`
 	// The highest log stream index that was archived.
 	TerminalIndex int64 `protobuf:"varint,3,opt,name=terminal_index,json=terminalIndex" json:"terminal_index,omitempty"`
+	// If not empty, there was an archival error.
+	//
+	// This field serves to indicate that an error occured (being non-empty) and
+	// to supply an value that will show up in the Coordinator ArchiveStream
+	// endpoint logs.
+	Error string `protobuf:"bytes,4,opt,name=error" json:"error,omitempty"`
 	// The archive URL of the log stream's stream data.
 	StreamUrl string `protobuf:"bytes,10,opt,name=stream_url,json=streamUrl" json:"stream_url,omitempty"`
 	// The size of the log stream's stream data.
@@ -446,42 +464,47 @@ var _Services_serviceDesc = grpc.ServiceDesc{
 }
 
 var fileDescriptor0 = []byte{
-	// 588 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x9c, 0x53, 0x5d, 0x6f, 0x12, 0x4d,
-	0x14, 0x0e, 0x94, 0x97, 0x17, 0x0e, 0x50, 0xed, 0x49, 0x4b, 0x60, 0x6b, 0x5b, 0x83, 0x31, 0xf1,
-	0x42, 0x97, 0x04, 0x2f, 0x9b, 0x98, 0x98, 0xda, 0x98, 0x26, 0x4d, 0x34, 0x8b, 0xf6, 0x52, 0xb2,
-	0x2c, 0xd3, 0x65, 0xe2, 0xb2, 0xb3, 0xce, 0x0c, 0x44, 0xbd, 0xf3, 0x5f, 0x78, 0xeb, 0x5f, 0xf4,
-	0x17, 0xb8, 0x73, 0x66, 0x16, 0x5a, 0x84, 0xd8, 0xf4, 0x66, 0x61, 0xce, 0xf3, 0x71, 0xe6, 0xe3,
-	0x39, 0xd0, 0x52, 0x4c, 0x2e, 0x78, 0xc4, 0xfc, 0x4c, 0x0a, 0x2d, 0xb0, 0x9a, 0x88, 0x78, 0x22,
-	0x62, 0xaf, 0xa1, 0x74, 0xa8, 0x5d, 0xd1, 0x3b, 0x8d, 0xb9, 0x9e, 0xce, 0xc7, 0x7e, 0x24, 0x66,
-	0xfd, 0x64, 0x1e, 0x71, 0xfa, 0xbc, 0x88, 0x45, 0x3f, 0x2f, 0xcc, 0x44, 0xda, 0x27, 0x56, 0xdf,
-	0x2a, 0xcd, 0x4f, 0x36, 0x36, 0x5f, 0x27, 0x3e, 0x8c, 0x85, 0x88, 0x13, 0x66, 0x49, 0xe3, 0xf9,
-	0x75, 0x9f, 0xcd, 0x32, 0xfd, 0xcd, 0x82, 0xbd, 0x1f, 0x25, 0xd8, 0x7b, 0xcb, 0xf4, 0x99, 0x48,
-	0xaf, 0x79, 0x1c, 0x30, 0x95, 0x89, 0x54, 0x31, 0x7c, 0x0e, 0x18, 0x51, 0x65, 0xe4, 0x36, 0x37,
-	0x9a, 0xcb, 0xa4, 0x53, 0x7a, 0x5c, 0x7a, 0x56, 0x0f, 0x1e, 0x5a, 0x64, 0x68, 0x81, 0x8f, 0x32,
-	0xc1, 0x23, 0x80, 0x25, 0x5b, 0x77, 0xca, 0xc4, 0xaa, 0x17, 0x2c, 0x8d, 0x27, 0xd0, 0x70, 0x70,
-	0x16, 0xea, 0x69, 0x67, 0x87, 0x70, 0xa7, 0x78, 0x9f, 0x57, 0x7a, 0x3f, 0x4b, 0x70, 0x10, 0xb0,
-	0x98, 0x2b, 0xcd, 0xe4, 0x50, 0x4b, 0x16, 0xce, 0x02, 0xf6, 0x65, 0xce, 0x94, 0x46, 0x84, 0x0a,
-	0x69, 0x6c, 0x67, 0xfa, 0x8f, 0x6d, 0xa8, 0x2a, 0x16, 0x49, 0xd7, 0xa9, 0x19, 0xb8, 0x15, 0x3e,
-	0x81, 0x16, 0x1d, 0x69, 0xb4, 0x60, 0x52, 0x71, 0x91, 0xba, 0x46, 0x4d, 0x2a, 0x5e, 0xd9, 0x1a,
-	0xfa, 0x50, 0x99, 0x30, 0x15, 0x75, 0x2a, 0x39, 0xd6, 0x18, 0x78, 0x3e, 0xdd, 0x95, 0x7f, 0x29,
-	0x62, 0xdb, 0xf7, 0x4d, 0x8e, 0x49, 0x9e, 0x69, 0x21, 0x03, 0xe2, 0xf5, 0x3e, 0x41, 0x7b, 0x7d,
-	0x67, 0xcb, 0x2b, 0xfa, 0x8f, 0x5e, 0x88, 0xf6, 0xd6, 0x18, 0xb4, 0x7d, 0x7b, 0xfb, 0x2b, 0xaf,
-	0xa1, 0x41, 0x03, 0x4b, 0xda, 0xb6, 0xe9, 0xde, 0x29, 0xec, 0x5d, 0x8a, 0x70, 0xf2, 0xef, 0x53,
-	0xa3, 0xdb, 0xb8, 0x91, 0xd7, 0xdc, 0xe6, 0xae, 0x00, 0x6f, 0x8a, 0xef, 0xb5, 0xb1, 0x9b, 0xbe,
-	0x4d, 0xe7, 0xfb, 0x19, 0xda, 0x1f, 0x98, 0x9c, 0xf1, 0x34, 0x27, 0xdc, 0xff, 0x3d, 0x9e, 0xc2,
-	0xae, 0xb6, 0x2e, 0xc9, 0x88, 0xa7, 0x13, 0xf6, 0x95, 0x1e, 0x64, 0x27, 0x68, 0x15, 0xd5, 0x0b,
-	0x53, 0xec, 0xfd, 0x2a, 0xc3, 0xfe, 0x6b, 0x19, 0x4d, 0xf9, 0xe2, 0x0e, 0xbd, 0x3c, 0xa8, 0xe5,
-	0x89, 0xcf, 0x12, 0x96, 0x1f, 0xcf, 0xde, 0xc4, 0x72, 0x7d, 0xc7, 0x7e, 0x26, 0xac, 0x8a, 0xfa,
-	0x50, 0xa4, 0xc1, 0x86, 0xd5, 0x56, 0x4c, 0x96, 0xf3, 0xb0, 0x3a, 0x58, 0xf1, 0xef, 0xac, 0xd3,
-	0x20, 0x0b, 0xa7, 0x18, 0xe6, 0x15, 0x3c, 0x84, 0x3a, 0xb9, 0x93, 0x7c, 0x9f, 0xe4, 0x35, 0x2a,
-	0xb8, 0x49, 0xb0, 0x20, 0x89, 0x0f, 0x48, 0x6c, 0xe9, 0xa4, 0xed, 0x42, 0x6d, 0x12, 0xea, 0x90,
-	0xa4, 0xc7, 0x24, 0xfd, 0xdf, 0xac, 0x8d, 0x32, 0xb7, 0x25, 0x88, 0x84, 0x27, 0x24, 0x24, 0xae,
-	0xd1, 0x0d, 0x7e, 0x97, 0xa1, 0xe6, 0xe6, 0x4d, 0xe1, 0x2b, 0xa8, 0x2f, 0x07, 0x16, 0xdb, 0xbe,
-	0x1d, 0x6e, 0xbf, 0x18, 0x6e, 0xff, 0xdc, 0x0c, 0xb7, 0xd7, 0x2d, 0x5e, 0xfd, 0xef, 0xd9, 0x7e,
-	0x07, 0xbb, 0xb7, 0x23, 0x8d, 0x47, 0x05, 0x79, 0xe3, 0x10, 0x7a, 0xc7, 0xdb, 0x60, 0x67, 0x78,
-	0x06, 0xb0, 0x8a, 0x21, 0x76, 0x57, 0x79, 0x5b, 0xcb, 0xb5, 0xe7, 0x6d, 0x82, 0x9c, 0xc9, 0x05,
-	0x3c, 0x58, 0xcb, 0x1c, 0x2e, 0xfb, 0x6e, 0x0e, 0xa3, 0xb7, 0xe5, 0xec, 0x78, 0x0e, 0xad, 0x5b,
-	0x81, 0xc2, 0x47, 0x85, 0xd1, 0xa6, 0x9c, 0x6d, 0xb3, 0x19, 0x57, 0x69, 0xfd, 0xf2, 0x4f, 0x00,
-	0x00, 0x00, 0xff, 0xff, 0x99, 0xc8, 0x1b, 0x2f, 0xa0, 0x05, 0x00, 0x00,
+	// 665 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x9c, 0x54, 0xdd, 0x6e, 0xd3, 0x4c,
+	0x10, 0x55, 0xfa, 0xf7, 0x25, 0xe3, 0xa4, 0xfd, 0xba, 0x6a, 0xa3, 0xc4, 0xa5, 0x2d, 0x04, 0x81,
+	0x90, 0x00, 0x47, 0x0a, 0x97, 0x95, 0x90, 0x50, 0x5b, 0xa1, 0x8a, 0x4a, 0x20, 0x07, 0xb8, 0xc4,
+	0x72, 0xec, 0xad, 0x6b, 0xd5, 0xf1, 0x9a, 0xdd, 0x75, 0x45, 0xb8, 0xe3, 0x2d, 0x78, 0x02, 0x5e,
+	0x84, 0x37, 0xe2, 0x09, 0xd8, 0x9d, 0x5d, 0xa7, 0x6d, 0x9a, 0x88, 0xaa, 0x37, 0x4e, 0xf6, 0x9c,
+	0x39, 0x33, 0xb3, 0xe3, 0x33, 0x86, 0x96, 0xa0, 0xfc, 0x32, 0x8d, 0xa8, 0x57, 0x70, 0x26, 0x19,
+	0x59, 0xcb, 0x58, 0x12, 0xb3, 0xc4, 0x75, 0x84, 0x0c, 0xa5, 0x05, 0xdd, 0x83, 0x24, 0x95, 0xe7,
+	0xe5, 0xc8, 0x8b, 0xd8, 0xb8, 0x9f, 0x95, 0x51, 0x8a, 0x8f, 0x97, 0x09, 0xeb, 0x2b, 0x60, 0xcc,
+	0xf2, 0x3e, 0x46, 0xf5, 0x8d, 0x52, 0xff, 0x14, 0x23, 0xfd, 0xb4, 0xe2, 0xbd, 0x84, 0xb1, 0x24,
+	0xa3, 0x26, 0x68, 0x54, 0x9e, 0xf5, 0xe3, 0x92, 0x87, 0x32, 0x65, 0xb9, 0xe5, 0x77, 0x66, 0x79,
+	0x3a, 0x2e, 0xe4, 0xc4, 0x90, 0xbd, 0x1f, 0x35, 0xd8, 0x7c, 0x4b, 0xe5, 0x21, 0xcb, 0xcf, 0xd2,
+	0xc4, 0xa7, 0xa2, 0x60, 0xb9, 0xa0, 0xe4, 0x05, 0x90, 0x08, 0x91, 0xc0, 0x36, 0x1f, 0x94, 0x3c,
+	0xeb, 0xd4, 0x1e, 0xd6, 0x9e, 0x35, 0xfc, 0xff, 0x0d, 0x33, 0x34, 0xc4, 0x27, 0x9e, 0x91, 0x5d,
+	0x80, 0x69, 0xb4, 0xec, 0x2c, 0x61, 0x54, 0xa3, 0x8a, 0x92, 0x64, 0x1f, 0x1c, 0x4b, 0x17, 0xa1,
+	0x3c, 0xef, 0x2c, 0x23, 0x6f, 0x15, 0x1f, 0x14, 0xd2, 0xfb, 0x59, 0x83, 0x6d, 0x9f, 0x26, 0xa9,
+	0x90, 0x94, 0x0f, 0x25, 0xa7, 0xe1, 0xd8, 0xa7, 0x5f, 0x4b, 0x2a, 0x24, 0x21, 0xb0, 0x82, 0x1a,
+	0x53, 0x19, 0xff, 0x93, 0x36, 0xac, 0x09, 0x1a, 0x71, 0x5b, 0xa9, 0xe9, 0xdb, 0x13, 0x79, 0x0c,
+	0x2d, 0xbc, 0x52, 0x70, 0x49, 0xb9, 0x50, 0xb7, 0xb7, 0x85, 0x9a, 0x08, 0x7e, 0x36, 0x18, 0xf1,
+	0x60, 0x25, 0xa6, 0x22, 0xea, 0xac, 0x28, 0xce, 0x19, 0xb8, 0x1e, 0xce, 0xd2, 0x3b, 0x65, 0x89,
+	0xa9, 0x7b, 0xa4, 0x38, 0x9e, 0x16, 0x92, 0x71, 0x1f, 0xe3, 0x7a, 0x5f, 0xa0, 0x3d, 0xdb, 0xd9,
+	0x74, 0x44, 0xab, 0xf8, 0x06, 0xb1, 0x37, 0x67, 0xd0, 0xf6, 0xcc, 0xdb, 0xb9, 0xca, 0x35, 0xd4,
+	0xac, 0x6f, 0x82, 0x16, 0x35, 0xdd, 0x3b, 0x80, 0xcd, 0x53, 0x16, 0xc6, 0xff, 0xbe, 0x35, 0xb1,
+	0x8d, 0x6b, 0x79, 0xdd, 0x36, 0xf7, 0xab, 0x06, 0xe4, 0xba, 0xfa, 0x5e, 0x9d, 0x5d, 0x4f, 0xdc,
+	0x34, 0x89, 0xc9, 0x73, 0x58, 0x0e, 0x13, 0x8a, 0x03, 0x74, 0x06, 0x5d, 0xcf, 0xf8, 0xc7, 0xab,
+	0xfc, 0xe3, 0x1d, 0x59, 0x7f, 0xf9, 0x3a, 0x8a, 0x3c, 0x82, 0x66, 0xc8, 0xa3, 0xf3, 0xf4, 0x32,
+	0xcc, 0x82, 0x0b, 0x3a, 0xc1, 0xd1, 0x36, 0x7d, 0xa7, 0xc2, 0xde, 0xd1, 0x49, 0xef, 0x02, 0xda,
+	0x1f, 0x29, 0x1f, 0xa7, 0xb9, 0x2a, 0x78, 0xff, 0x17, 0xfc, 0x04, 0xd6, 0xa5, 0xc9, 0x92, 0x05,
+	0x69, 0x1e, 0xd3, 0x6f, 0xd8, 0xe0, 0xb2, 0xdf, 0xaa, 0xd0, 0x13, 0x0d, 0xf6, 0x7e, 0x2f, 0xc1,
+	0xd6, 0x1b, 0x2c, 0x7e, 0x87, 0x5a, 0x4f, 0x61, 0x43, 0x4d, 0x27, 0xa0, 0xb9, 0xe4, 0x93, 0x20,
+	0x62, 0x65, 0x6e, 0x8a, 0xaa, 0xa4, 0x0a, 0x3e, 0xd6, 0xe8, 0xa1, 0x06, 0xef, 0x58, 0x9b, 0x6c,
+	0xc1, 0x2a, 0xe5, 0x9c, 0x71, 0x1c, 0x42, 0xc3, 0x37, 0x07, 0xbd, 0x1f, 0x02, 0x3b, 0xc1, 0x2d,
+	0x02, 0xb3, 0x1f, 0x06, 0xd1, 0xeb, 0xa3, 0xf6, 0xc3, 0xd2, 0x22, 0xfd, 0x4e, 0x3b, 0x0e, 0x26,
+	0xb6, 0x8a, 0xa1, 0x42, 0xc8, 0x0e, 0x34, 0xb0, 0x26, 0xca, 0xb7, 0x50, 0x5e, 0x47, 0xc0, 0x2e,
+	0x9f, 0x21, 0x51, 0xbc, 0x8d, 0x62, 0x13, 0x8e, 0xda, 0x2e, 0xd4, 0xe3, 0x50, 0x86, 0x28, 0xdd,
+	0x43, 0xe9, 0x7f, 0xfa, 0xac, 0x95, 0x2a, 0x2d, 0x52, 0x28, 0xdc, 0x47, 0x21, 0xc6, 0x6a, 0xdd,
+	0xe0, 0xcf, 0x12, 0xd4, 0xed, 0x8a, 0x0b, 0xf2, 0x1a, 0x1a, 0xd3, 0x6f, 0x04, 0x69, 0xdf, 0xf2,
+	0xc3, 0xb1, 0xfe, 0x9e, 0xb8, 0xdd, 0xca, 0x67, 0xb7, 0x3f, 0x27, 0xef, 0x61, 0xfd, 0xe6, 0x16,
+	0x91, 0xdd, 0x2a, 0x78, 0xee, 0xde, 0xbb, 0x7b, 0x8b, 0x68, 0x9b, 0xf0, 0x10, 0xe0, 0xca, 0xf8,
+	0xa4, 0x7b, 0xe5, 0xf0, 0x99, 0x55, 0x72, 0xdd, 0x79, 0x94, 0x4d, 0x72, 0x02, 0x1b, 0x33, 0xae,
+	0x24, 0xd3, 0xba, 0xf3, 0xed, 0xea, 0x2e, 0xb8, 0x3b, 0x39, 0x86, 0xd6, 0x0d, 0xcb, 0x91, 0x07,
+	0x55, 0xa2, 0x79, 0x4e, 0x5c, 0x94, 0x66, 0xb4, 0x86, 0xe7, 0x57, 0x7f, 0x03, 0x00, 0x00, 0xff,
+	0xff, 0xc7, 0xcb, 0x5f, 0xb5, 0x33, 0x06, 0x00, 0x00,
 }