LogDog: Update to archival V2.

common/proto/logdog/svcconfig/config.pb.go

Index: common/proto/logdog/svcconfig/config.pb.go
diff --git a/common/proto/logdog/svcconfig/config.pb.go b/common/proto/logdog/svcconfig/config.pb.go
index 16b151b39dc06ee93935cffb0cfcb7d9987c441d..494a796324d73160ea8c839019702fe04e6a7b60 100644
--- a/common/proto/logdog/svcconfig/config.pb.go
+++ b/common/proto/logdog/svcconfig/config.pb.go
@@ -101,30 +101,29 @@ type Coordinator struct {
 	RpcAllowOrigins []string `protobuf:"bytes,20,rep,name=rpc_allow_origins,json=rpcAllowOrigins" json:"rpc_allow_origins,omitempty"`
 	// The name of the archive task queue.
 	ArchiveTaskQueue string `protobuf:"bytes,30,opt,name=archive_task_queue,json=archiveTaskQueue" json:"archive_task_queue,omitempty"`
-	// The amount of time after a log has been terminated before it is candidate
+	// The grace period after a log has been terminated and before it is candidate
 	// for archival.
 	//
-	// Archival triggered by this delay will NOT succeed if any log entries are
-	// missing from intermediate storage.
-	//
-	// This should be based on a period of time where it's reasonable to expect
-	// that all log messages in the transport have arrived for a given log stream.
-	// Since the transport doesn't have to guarantee in-order delivery, this
-	// should allow for the case where the terminal log entry arrives before some
-	// of the intermediate log entries. This will help avoid triggering
-	// archive attempts that are doomed to fail because of standard transport lag.
-	ArchiveDelay *google_protobuf.Duration `protobuf:"bytes,31,opt,name=archive_delay,json=archiveDelay" json:"archive_delay,omitempty"`
+	// This grace period is purely an optimization, providing time for
+	// out-of-order logs to settle and be ingested into intermediate storage and
+	// avoiding wasted Archivist cycles.
+	ArchiveSettleDelay *google_protobuf.Duration `protobuf:"bytes,31,opt,name=archive_settle_delay,json=archiveSettleDelay" json:"archive_settle_delay,omitempty"`
 	// The amount of time before a log stream is candidate for archival regardless
 	// of whether or not it's been terminated or complete.
 	//
-	// This endpoint is a failsafe designed to ensure that log streams with
-	// missing records or no terminal record (e.g., Butler crashed) are eventually
-	// moved out of intermediate storage.
+	// This is a failsafe designed to ensure that log streams with missing records
+	// or no terminal record (e.g., Butler crashed) are eventually archived.
 	//
-	// This must be >= `archive_delay`, and should be fairly large (days) to allow
-	// for the log stream to complete and for all available log entries to be
-	// added to intermediate storage.
+	// This should be fairly large (days) to avoid prematurely archiving
+	// long-running streams, but should be considerably smaller than the
+	// intermediate storage data retention period.
 	ArchiveDelayMax *google_protobuf.Duration `protobuf:"bytes,32,opt,name=archive_delay_max,json=archiveDelayMax" json:"archive_delay_max,omitempty"`
+	// The maximum number of times to retry a failed stream archival before giving
+	// up and clearing the stream.
+	//
+	// This only affects fatal archival failures (e.g., data corruption), not
+	// partial log stream content or transient failures.
+	ArchiveRetries int32 `protobuf:"varint,33,opt,name=archive_retries,json=archiveRetries" json:"archive_retries,omitempty"`
 }
 
 func (m *Coordinator) Reset()                    { *m = Coordinator{} }
@@ -132,9 +131,9 @@ func (m *Coordinator) String() string            { return proto.CompactTextStrin
 func (*Coordinator) ProtoMessage()               {}
 func (*Coordinator) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
 
-func (m *Coordinator) GetArchiveDelay() *google_protobuf.Duration {
+func (m *Coordinator) GetArchiveSettleDelay() *google_protobuf.Duration {
 	if m != nil {
-		return m.ArchiveDelay
+		return m.ArchiveSettleDelay
 	}
 	return nil
 }
@@ -206,42 +205,43 @@ func init() {
 }
 
 var fileDescriptor0 = []byte{
-	// 579 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x84, 0x93, 0xdf, 0x4e, 0xdb, 0x30,
-	0x14, 0xc6, 0x05, 0x8c, 0x56, 0x71, 0x5b, 0x4a, 0xbd, 0x52, 0x3c, 0xa4, 0x31, 0xd4, 0x2b, 0x34,
-	0x4d, 0x41, 0x62, 0xd2, 0xb4, 0xab, 0x49, 0x5d, 0x41, 0xd3, 0x2e, 0x10, 0x5a, 0x40, 0xda, 0xa5,
-	0xe5, 0xa6, 0x6e, 0xea, 0x91, 0xc6, 0x99, 0xed, 0x94, 0xb2, 0x67, 0xd8, 0xeb, 0xec, 0x7d, 0xf6,
-	0x04, 0x7b, 0x86, 0xf9, 0x5f, 0xfe, 0x20, 0x2e, 0xb8, 0xf4, 0xf7, 0xfd, 0xbe, 0x13, 0x9f, 0xe3,
-	0x13, 0xd0, 0x8d, 0x79, 0xb6, 0x60, 0x49, 0x98, 0x0b, 0xae, 0x38, 0x0c, 0xe4, 0x3a, 0x76, 0xc2,
-	0x51, 0x5f, 0x09, 0x92, 0xc9, 0x9c, 0x0b, 0xe5, 0xbc, 0xa3, 0x9e, 0x54, 0x5c, 0x90, 0x84, 0xfa,
-	0xe3, 0x71, 0xc2, 0x79, 0x92, 0xd2, 0x33, 0x7b, 0x9a, 0x15, 0x8b, 0xb3, 0x79, 0x21, 0x88, 0x62,
-	0x3c, 0x73, 0xfe, 0xf8, 0xf7, 0x36, 0x68, 0x4d, 0x6d, 0x29, 0x78, 0x0e, 0x82, 0xaa, 0x18, 0x02,
-	0x27, 0x5b, 0xa7, 0x9d, 0xf3, 0x61, 0x58, 0x7d, 0x29, 0xbc, 0x2d, 0xbd, 0xa8, 0xc6, 0xe0, 0x3b,
-	0xd0, 0xf6, 0xdf, 0x43, 0x1d, 0x9b, 0x80, 0x8d, 0xc4, 0x8d, 0x73, 0xa2, 0x12, 0x81, 0x1f, 0x41,
-	0x27, 0xe6, 0x5c, 0xcc, 0x59, 0x46, 0xb4, 0x82, 0x86, 0x36, 0x31, 0x6a, 0x24, 0xa6, 0xb5, 0x1b,
-	0x35, 0x51, 0x73, 0xb7, 0x98, 0xa7, 0x29, 0x8d, 0x4d, 0xee, 0xe0, 0xc9, 0xdd, 0xa6, 0xa5, 0x17,
-	0xd5, 0x98, 0xc9, 0x10, 0x11, 0x2f, 0xd9, 0x9a, 0x49, 0x85, 0x46, 0x4f, 0x32, 0x93, 0xd2, 0x8b,
-	0x6a, 0x6c, 0xfc, 0x77, 0x1b, 0x74, 0x1a, 0x97, 0x80, 0x08, 0xb4, 0xf5, 0x9c, 0x7e, 0xe8, 0x82,
-	0x68, 0x4b, 0x57, 0x08, 0xa2, 0xf2, 0x08, 0x4f, 0xc1, 0x3e, 0x99, 0xaf, 0x58, 0x86, 0x49, 0xa1,
-	0x96, 0x38, 0x11, 0xbc, 0xc8, 0xed, 0xd0, 0x82, 0x68, 0xcf, 0xea, 0x13, 0x2d, 0x7f, 0x31, 0xaa,
-	0x9e, 0x11, 0x94, 0x54, 0xac, 0x59, 0x4c, 0x9b, 0x6c, 0xc7, 0xb2, 0xfb, 0xde, 0xa9, 0xe9, 0xb7,
-	0x60, 0x20, 0xf2, 0x18, 0x93, 0x34, 0xe5, 0xf7, 0x98, 0x0b, 0x96, 0xb0, 0x4c, 0xea, 0x49, 0xed,
-	0x68, 0xb8, 0xaf, 0x8d, 0x89, 0xd1, 0xaf, 0x9d, 0x6c, 0x2a, 0xbb, 0xab, 0x53, 0xac, 0x88, 0xbc,
-	0xc3, 0x3f, 0x0b, 0x5a, 0x50, 0x74, 0xec, 0x2a, 0x7b, 0xe7, 0x56, 0x1b, 0xdf, 0x8c, 0x0e, 0x3f,
-	0x81, 0x5e, 0x49, 0xcf, 0x69, 0x4a, 0x1e, 0xd0, 0x1b, 0x3b, 0x93, 0x57, 0xa1, 0x5b, 0x91, 0xb0,
-	0x5c, 0x91, 0xf0, 0xc2, 0xaf, 0x48, 0xd4, 0xf5, 0xfc, 0x85, 0xc1, 0xe1, 0x25, 0x18, 0x3c, 0xca,
-	0xe3, 0x15, 0xd9, 0xa0, 0x93, 0xe7, 0x6a, 0xf4, 0x9b, 0x35, 0xae, 0xc8, 0x66, 0xfc, 0x6f, 0x0b,
-	0x04, 0xd5, 0x7b, 0xc1, 0x0f, 0xe0, 0x50, 0x97, 0xc1, 0xfa, 0x4d, 0xe2, 0x42, 0x08, 0x9a, 0x29,
-	0xbc, 0xa2, 0x52, 0xea, 0x65, 0x91, 0x76, 0xe0, 0xbb, 0xd1, 0x81, 0xb6, 0xa7, 0x95, 0x7b, 0xe5,
-	0x4d, 0x18, 0x82, 0x97, 0x26, 0xe7, 0x61, 0x7c, 0xcf, 0xc5, 0x1d, 0x15, 0x12, 0x6d, 0xdb, 0xcc,
-	0x40, 0x5b, 0x9e, 0xfc, 0xee, 0x0c, 0xf3, 0x5c, 0x52, 0x11, 0x45, 0x71, 0x4c, 0xe2, 0x25, 0xc5,
-	0x92, 0xfd, 0xa2, 0x68, 0xc7, 0xc2, 0x7b, 0x56, 0x9f, 0x1a, 0xf9, 0x46, 0xab, 0xf0, 0x1a, 0x8c,
-	0x9a, 0x24, 0xdd, 0xe4, 0xcc, 0xb5, 0x82, 0x5e, 0x3c, 0xd7, 0xeb, 0xb0, 0x2e, 0x75, 0x59, 0xc5,
-	0xc6, 0x7f, 0x74, 0xc3, 0xd5, 0xb2, 0xc1, 0x21, 0xd8, 0x35, 0x6f, 0x55, 0xb6, 0xe7, 0x0e, 0xf0,
-	0x10, 0xb4, 0x13, 0x89, 0x67, 0x44, 0x52, 0xbf, 0x44, 0xad, 0x44, 0x7e, 0xd6, 0x27, 0xbb, 0x3c,
-	0x4a, 0x50, 0xb2, 0xc2, 0x2c, 0x9b, 0xd3, 0x0d, 0xd6, 0x7f, 0x9e, 0xff, 0xd7, 0x76, 0xf5, 0xf2,
-	0x58, 0xe7, 0xab, 0x31, 0x22, 0xa3, 0x1b, 0x3a, 0x17, 0x74, 0xc1, 0x36, 0x8f, 0xe8, 0xae, 0xa3,
-	0x9d, 0xd3, 0xa0, 0x5f, 0x03, 0x30, 0x7b, 0xd0, 0x8d, 0x3a, 0xaa, 0x67, 0xa9, 0xc0, 0x28, 0xd6,
-	0x9e, 0xb5, 0x6c, 0x83, 0xef, 0xff, 0x07, 0x00, 0x00, 0xff, 0xff, 0x08, 0xf6, 0x0f, 0x5c, 0x7c,
-	0x04, 0x00, 0x00,
+	// 602 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x84, 0x53, 0xcd, 0x4e, 0x14, 0x31,
+	0x1c, 0x0f, 0xe0, 0x42, 0xa6, 0x0b, 0x02, 0x75, 0x59, 0x2a, 0x89, 0x88, 0x7b, 0x91, 0x18, 0x33,
+	0x24, 0x98, 0x18, 0xaf, 0xeb, 0x42, 0x8c, 0x31, 0x84, 0x38, 0x4b, 0xe2, 0xb1, 0xe9, 0xce, 0x76,
+	0x67, 0x2b, 0xb3, 0xd3, 0xb1, 0xed, 0x2c, 0x8b, 0xcf, 0xe0, 0xd9, 0x37, 0xf1, 0xb5, 0x7c, 0x06,
+	0xff, 0x6d, 0xe7, 0xcb, 0x70, 0xe0, 0xd8, 0xdf, 0x57, 0xfb, 0xff, 0x28, 0xda, 0x8e, 0x65, 0x36,
+	0x13, 0x49, 0x98, 0x2b, 0x69, 0x24, 0x0e, 0xf4, 0x32, 0xf6, 0xc0, 0xd1, 0xae, 0x51, 0x2c, 0xd3,
+	0xb9, 0x54, 0xc6, 0x73, 0x47, 0x3b, 0xda, 0x48, 0xc5, 0x12, 0x5e, 0x1e, 0x8f, 0x13, 0x29, 0x93,
+	0x94, 0x9f, 0xb9, 0xd3, 0xa4, 0x98, 0x9d, 0x4d, 0x0b, 0xc5, 0x8c, 0x90, 0x99, 0xe7, 0x07, 0xbf,
+	0xd6, 0xd1, 0xe6, 0xc8, 0x45, 0xe1, 0x73, 0x14, 0xd4, 0x61, 0x04, 0x9d, 0xac, 0x9d, 0x76, 0xcf,
+	0x7b, 0x61, 0x7d, 0x53, 0x78, 0x53, 0x71, 0x51, 0x23, 0xc3, 0x6f, 0xd1, 0x56, 0x79, 0x1f, 0xe9,
+	0x3a, 0x07, 0x6e, 0x39, 0xc6, 0x9e, 0x89, 0x2a, 0x09, 0xfe, 0x80, 0xba, 0xb1, 0x94, 0x6a, 0x2a,
+	0x32, 0x06, 0x08, 0xe9, 0x39, 0x47, 0xbf, 0xe5, 0x18, 0x35, 0x6c, 0xd4, 0x96, 0xda, 0xb7, 0xc5,
+	0x32, 0x4d, 0x79, 0x6c, 0x7d, 0x07, 0x0f, 0xde, 0x36, 0xaa, 0xb8, 0xa8, 0x91, 0x59, 0x0f, 0x53,
+	0xf1, 0x5c, 0x2c, 0x85, 0x36, 0xa4, 0xff, 0xc0, 0x33, 0xac, 0xb8, 0xa8, 0x91, 0x0d, 0x7e, 0x6f,
+	0xa0, 0x6e, 0xeb, 0x11, 0x98, 0xa0, 0x2d, 0xe8, 0xd3, 0x77, 0x08, 0x24, 0x6b, 0x90, 0x10, 0x44,
+	0xd5, 0x11, 0x9f, 0xa2, 0x3d, 0x36, 0x5d, 0x88, 0x8c, 0xb2, 0xc2, 0xcc, 0x69, 0xa2, 0x64, 0x91,
+	0xbb, 0xa6, 0x05, 0xd1, 0x53, 0x87, 0x0f, 0x01, 0xfe, 0x64, 0x51, 0xe8, 0x11, 0xd6, 0x5c, 0x2d,
+	0x45, 0xcc, 0xdb, 0xda, 0xae, 0xd3, 0xee, 0x95, 0x4c, 0xa3, 0x7e, 0x83, 0xf6, 0x55, 0x1e, 0x53,
+	0x96, 0xa6, 0xf2, 0x8e, 0x4a, 0x25, 0x12, 0x91, 0x69, 0xe8, 0xd4, 0x06, 0x88, 0x77, 0x81, 0x18,
+	0x5a, 0xfc, 0xda, 0xc3, 0x36, 0xd9, 0x3f, 0x9d, 0x53, 0xc3, 0xf4, 0x2d, 0xfd, 0x51, 0xf0, 0x82,
+	0x93, 0x63, 0x9f, 0x5c, 0x32, 0x37, 0x40, 0x7c, 0xb5, 0x38, 0xfe, 0x82, 0x7a, 0x95, 0x5a, 0x73,
+	0x63, 0x52, 0x4e, 0xa7, 0x3c, 0x65, 0xf7, 0xe4, 0xa5, 0x6b, 0xcd, 0xf3, 0xd0, 0x6f, 0x4a, 0x58,
+	0x6d, 0x4a, 0x78, 0x51, 0x6e, 0x4a, 0x54, 0x5d, 0x32, 0x76, 0xae, 0x0b, 0x6b, 0xc2, 0x97, 0x68,
+	0xbf, 0x0a, 0x73, 0x29, 0x74, 0xc1, 0x56, 0xe4, 0xe4, 0xb1, 0xa4, 0xdd, 0xd2, 0xe3, 0x32, 0xae,
+	0xd8, 0x0a, 0xbf, 0x46, 0x15, 0x44, 0x15, 0x37, 0x4a, 0x70, 0x4d, 0x5e, 0x41, 0x48, 0x07, 0x9a,
+	0xe8, 0xe1, 0xc8, 0xa3, 0x83, 0xbf, 0x6b, 0x28, 0xa8, 0xa7, 0x8c, 0xdf, 0xa3, 0x43, 0xb8, 0x8f,
+	0xc2, 0x24, 0xe3, 0x42, 0x29, 0x9e, 0x19, 0xba, 0xe0, 0x5a, 0xc3, 0x8a, 0x69, 0x37, 0xa6, 0x4e,
+	0x74, 0x00, 0xf4, 0xa8, 0x66, 0xaf, 0x4a, 0x12, 0x87, 0xe8, 0x99, 0xf5, 0x95, 0x62, 0x7a, 0x27,
+	0xd5, 0x2d, 0x57, 0x9a, 0xac, 0x3b, 0xcf, 0x3e, 0x50, 0xa5, 0xf2, 0x9b, 0x27, 0xec, 0x90, 0xb5,
+	0x61, 0x86, 0xd3, 0x98, 0xc5, 0x73, 0x68, 0x9b, 0xf8, 0xc9, 0xc9, 0x86, 0x7f, 0x9f, 0xc3, 0x47,
+	0x16, 0x1e, 0x03, 0x8a, 0xaf, 0x51, 0xbf, 0xad, 0xe4, 0xab, 0x5c, 0xf8, 0x9a, 0xc9, 0x93, 0xc7,
+	0x9a, 0xd2, 0x6b, 0xa2, 0x2e, 0x6b, 0xdb, 0xe0, 0x0f, 0x14, 0x5c, 0xaf, 0x28, 0xee, 0xa1, 0x8e,
+	0x9d, 0x70, 0x55, 0x9e, 0x3f, 0xe0, 0x43, 0xb4, 0x95, 0x68, 0x3a, 0x61, 0x9a, 0x97, 0xab, 0xb7,
+	0x99, 0xe8, 0x8f, 0x70, 0x72, 0x2b, 0x67, 0x14, 0x67, 0x0b, 0x2a, 0xb2, 0x29, 0x5f, 0x51, 0xf8,
+	0xaf, 0xe5, 0x0f, 0xed, 0xc0, 0xca, 0x39, 0xe6, 0xb3, 0x25, 0x22, 0x8b, 0x5b, 0x75, 0xae, 0xf8,
+	0x4c, 0xac, 0xfe, 0x53, 0x6f, 0x7b, 0xb5, 0x67, 0x5a, 0xea, 0x17, 0x08, 0x4d, 0xee, 0xa1, 0x50,
+	0xaf, 0xda, 0x71, 0xaa, 0xc0, 0x22, 0x8e, 0x9e, 0x6c, 0xba, 0x02, 0xdf, 0xfd, 0x0b, 0x00, 0x00,
+	0xff, 0xff, 0x4d, 0x53, 0xf1, 0x6a, 0xb2, 0x04, 0x00, 0x00,
 }