khenaidoo | bf6e7bb | 2018-08-14 22:27:29 -0400 | [diff] [blame] | 1 | /* |
| 2 | * Copyright 2018-present Open Networking Foundation |
| 3 | |
| 4 | * Licensed under the Apache License, Version 2.0 (the "License"); |
| 5 | * you may not use this file except in compliance with the License. |
| 6 | * You may obtain a copy of the License at |
| 7 | |
| 8 | * http://www.apache.org/licenses/LICENSE-2.0 |
| 9 | |
| 10 | * Unless required by applicable law or agreed to in writing, software |
| 11 | * distributed under the License is distributed on an "AS IS" BASIS, |
| 12 | * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
| 13 | * See the License for the specific language governing permissions and |
| 14 | * limitations under the License. |
| 15 | */ |
Stephane Barbarie | dc5022d | 2018-11-19 15:21:44 -0500 | [diff] [blame] | 16 | |
Stephane Barbarie | 4a2564d | 2018-07-26 11:02:58 -0400 | [diff] [blame] | 17 | package model |
| 18 | |
| 19 | import ( |
| 20 | "bytes" |
| 21 | "compress/gzip" |
Stephane Barbarie | 4a2564d | 2018-07-26 11:02:58 -0400 | [diff] [blame] | 22 | "github.com/golang/protobuf/proto" |
Stephane Barbarie | 88fbe7f | 2018-09-25 12:25:23 -0400 | [diff] [blame] | 23 | "github.com/opencord/voltha-go/common/log" |
Stephane Barbarie | e0a4c79 | 2019-01-16 11:26:29 -0500 | [diff] [blame] | 24 | "github.com/opencord/voltha-go/db/kvstore" |
Stephane Barbarie | 4a2564d | 2018-07-26 11:02:58 -0400 | [diff] [blame] | 25 | "reflect" |
Stephane Barbarie | dc5022d | 2018-11-19 15:21:44 -0500 | [diff] [blame] | 26 | "runtime/debug" |
Stephane Barbarie | 1ab4327 | 2018-12-08 21:42:13 -0500 | [diff] [blame] | 27 | "strings" |
Stephane Barbarie | dc5022d | 2018-11-19 15:21:44 -0500 | [diff] [blame] | 28 | "sync" |
Stephane Barbarie | 4a2564d | 2018-07-26 11:02:58 -0400 | [diff] [blame] | 29 | ) |
| 30 | |
Stephane Barbarie | dc5022d | 2018-11-19 15:21:44 -0500 | [diff] [blame] | 31 | // PersistedRevision holds information of revision meant to be saved in a persistent storage |
Stephane Barbarie | 4a2564d | 2018-07-26 11:02:58 -0400 | [diff] [blame] | 32 | type PersistedRevision struct { |
Stephane Barbarie | ec0919b | 2018-09-05 14:14:29 -0400 | [diff] [blame] | 33 | Revision |
Stephane Barbarie | 4a2564d | 2018-07-26 11:02:58 -0400 | [diff] [blame] | 34 | Compress bool |
Stephane Barbarie | e0a4c79 | 2019-01-16 11:26:29 -0500 | [diff] [blame] | 35 | |
Stephane Barbarie | 3cb0122 | 2019-01-16 17:15:56 -0500 | [diff] [blame] | 36 | events chan *kvstore.Event `json:"-"` |
| 37 | kvStore *Backend `json:"-"` |
| 38 | mutex sync.RWMutex `json:"-"` |
| 39 | isStored bool |
| 40 | isWatched bool |
Stephane Barbarie | 4a2564d | 2018-07-26 11:02:58 -0400 | [diff] [blame] | 41 | } |
| 42 | |
Stephane Barbarie | dc5022d | 2018-11-19 15:21:44 -0500 | [diff] [blame] | 43 | // NewPersistedRevision creates a new instance of a PersistentRevision structure |
Stephane Barbarie | ec0919b | 2018-09-05 14:14:29 -0400 | [diff] [blame] | 44 | func NewPersistedRevision(branch *Branch, data interface{}, children map[string][]Revision) Revision { |
Stephane Barbarie | 4a2564d | 2018-07-26 11:02:58 -0400 | [diff] [blame] | 45 | pr := &PersistedRevision{} |
Stephane Barbarie | dc5022d | 2018-11-19 15:21:44 -0500 | [diff] [blame] | 46 | pr.kvStore = branch.Node.GetRoot().KvStore |
| 47 | pr.Revision = NewNonPersistedRevision(nil, branch, data, children) |
Stephane Barbarie | 4a2564d | 2018-07-26 11:02:58 -0400 | [diff] [blame] | 48 | return pr |
| 49 | } |
| 50 | |
Stephane Barbarie | dc5022d | 2018-11-19 15:21:44 -0500 | [diff] [blame] | 51 | // Finalize is responsible of saving the revision in the persistent storage |
Stephane Barbarie | 1ab4327 | 2018-12-08 21:42:13 -0500 | [diff] [blame] | 52 | func (pr *PersistedRevision) Finalize(skipOnExist bool) { |
| 53 | pr.store(skipOnExist) |
Stephane Barbarie | 4a2564d | 2018-07-26 11:02:58 -0400 | [diff] [blame] | 54 | } |
| 55 | |
| 56 | type revData struct { |
| 57 | Children map[string][]string |
| 58 | Config string |
| 59 | } |
| 60 | |
Stephane Barbarie | 1ab4327 | 2018-12-08 21:42:13 -0500 | [diff] [blame] | 61 | func (pr *PersistedRevision) store(skipOnExist bool) { |
Stephane Barbarie | 88fbe7f | 2018-09-25 12:25:23 -0400 | [diff] [blame] | 62 | if pr.GetBranch().Txid != "" { |
| 63 | return |
| 64 | } |
Stephane Barbarie | 4a2564d | 2018-07-26 11:02:58 -0400 | [diff] [blame] | 65 | |
Stephane Barbarie | 1ab4327 | 2018-12-08 21:42:13 -0500 | [diff] [blame] | 66 | if pair, _ := pr.kvStore.Get(pr.GetHash()); pair != nil && skipOnExist { |
Stephane Barbarie | e0a4c79 | 2019-01-16 11:26:29 -0500 | [diff] [blame] | 67 | log.Debugw("revision-config-already-exists", log.Fields{"hash": pr.GetHash()}) |
Stephane Barbarie | 4a2564d | 2018-07-26 11:02:58 -0400 | [diff] [blame] | 68 | return |
| 69 | } |
Stephane Barbarie | 1ab4327 | 2018-12-08 21:42:13 -0500 | [diff] [blame] | 70 | |
Stephane Barbarie | ec0919b | 2018-09-05 14:14:29 -0400 | [diff] [blame] | 71 | if blob, err := proto.Marshal(pr.GetConfig().Data.(proto.Message)); err != nil { |
Stephane Barbarie | 4a2564d | 2018-07-26 11:02:58 -0400 | [diff] [blame] | 72 | // TODO report error |
| 73 | } else { |
| 74 | if pr.Compress { |
| 75 | var b bytes.Buffer |
| 76 | w := gzip.NewWriter(&b) |
| 77 | w.Write(blob) |
| 78 | w.Close() |
| 79 | blob = b.Bytes() |
| 80 | } |
Stephane Barbarie | dc5022d | 2018-11-19 15:21:44 -0500 | [diff] [blame] | 81 | |
Stephane Barbarie | 1ab4327 | 2018-12-08 21:42:13 -0500 | [diff] [blame] | 82 | if err := pr.kvStore.Put(pr.GetHash(), blob); err != nil { |
Stephane Barbarie | e0a4c79 | 2019-01-16 11:26:29 -0500 | [diff] [blame] | 83 | log.Warnw("problem-storing-revision-config", |
| 84 | log.Fields{"error": err, "hash": pr.GetHash(), "data": pr.GetConfig().Data}) |
Stephane Barbarie | dc5022d | 2018-11-19 15:21:44 -0500 | [diff] [blame] | 85 | } else { |
Stephane Barbarie | e0a4c79 | 2019-01-16 11:26:29 -0500 | [diff] [blame] | 86 | log.Debugw("storing-revision-config", |
| 87 | log.Fields{"hash": pr.GetHash(), "data": pr.GetConfig().Data}) |
Stephane Barbarie | 3cb0122 | 2019-01-16 17:15:56 -0500 | [diff] [blame] | 88 | pr.isStored = true |
Stephane Barbarie | dc5022d | 2018-11-19 15:21:44 -0500 | [diff] [blame] | 89 | } |
Stephane Barbarie | 4a2564d | 2018-07-26 11:02:58 -0400 | [diff] [blame] | 90 | } |
| 91 | } |
| 92 | |
Stephane Barbarie | e0a4c79 | 2019-01-16 11:26:29 -0500 | [diff] [blame] | 93 | func (pr *PersistedRevision) SetupWatch(key string) { |
| 94 | if pr.events == nil { |
| 95 | pr.events = make(chan *kvstore.Event) |
| 96 | |
| 97 | log.Debugw("setting-watch", log.Fields{"key": key}) |
| 98 | |
| 99 | pr.events = pr.kvStore.CreateWatch(key) |
| 100 | |
Stephane Barbarie | 3cb0122 | 2019-01-16 17:15:56 -0500 | [diff] [blame] | 101 | pr.isWatched = true |
| 102 | |
Stephane Barbarie | e0a4c79 | 2019-01-16 11:26:29 -0500 | [diff] [blame] | 103 | // Start watching |
| 104 | go pr.startWatching() |
| 105 | } |
| 106 | } |
| 107 | |
| 108 | func (pr *PersistedRevision) startWatching() { |
| 109 | log.Debugw("starting-watch", log.Fields{"key": pr.GetHash()}) |
| 110 | |
| 111 | StopWatchLoop: |
| 112 | for { |
| 113 | select { |
| 114 | case event, ok := <-pr.events: |
| 115 | if !ok { |
| 116 | log.Errorw("event-channel-failure: stopping watch loop", log.Fields{"key": pr.GetHash()}) |
| 117 | break StopWatchLoop |
| 118 | } |
| 119 | |
| 120 | log.Debugw("received-event", log.Fields{"type": event.EventType}) |
| 121 | |
| 122 | switch event.EventType { |
| 123 | case kvstore.DELETE: |
| 124 | log.Debugw("delete-from-memory", log.Fields{"key": pr.GetHash()}) |
| 125 | pr.Revision.Drop("", true) |
| 126 | break StopWatchLoop |
| 127 | |
| 128 | case kvstore.PUT: |
| 129 | log.Debugw("update-in-memory", log.Fields{"key": pr.GetHash()}) |
| 130 | |
| 131 | if dataPair, err := pr.kvStore.Get(pr.GetHash()); err != nil || dataPair == nil { |
| 132 | log.Errorw("update-in-memory--key-retrieval-failed", log.Fields{"key": pr.GetHash(), "error": err}) |
| 133 | } else { |
Stephane Barbarie | df5479f | 2019-01-29 22:13:00 -0500 | [diff] [blame] | 134 | data := reflect.New(reflect.TypeOf(pr.GetData()).Elem()) |
| 135 | |
| 136 | if err := proto.Unmarshal(dataPair.Value.([]byte), data.Interface().(proto.Message)); err != nil { |
| 137 | log.Errorw("update-in-memory--unmarshal-failed", log.Fields{"key": pr.GetHash(), "error": err}) |
| 138 | } else { |
| 139 | pr.UpdateData(data.Interface(), pr.GetBranch()) |
| 140 | } |
Stephane Barbarie | e0a4c79 | 2019-01-16 11:26:29 -0500 | [diff] [blame] | 141 | } |
| 142 | |
| 143 | default: |
| 144 | log.Debugw("unhandled-event", log.Fields{"key": pr.GetHash(), "type": event.EventType}) |
| 145 | } |
| 146 | } |
| 147 | } |
| 148 | |
| 149 | log.Debugw("exiting-watch", log.Fields{"key": pr.GetHash()}) |
| 150 | } |
| 151 | |
Stephane Barbarie | 1ab4327 | 2018-12-08 21:42:13 -0500 | [diff] [blame] | 152 | func (pr *PersistedRevision) LoadFromPersistence(path string, txid string) []Revision { |
Stephane Barbarie | e0a4c79 | 2019-01-16 11:26:29 -0500 | [diff] [blame] | 153 | log.Debugw("loading-from-persistence", log.Fields{"path": path, "txid": txid}) |
| 154 | |
Stephane Barbarie | 1ab4327 | 2018-12-08 21:42:13 -0500 | [diff] [blame] | 155 | var response []Revision |
| 156 | var rev Revision |
Stephane Barbarie | 4a2564d | 2018-07-26 11:02:58 -0400 | [diff] [blame] | 157 | |
Stephane Barbarie | 1ab4327 | 2018-12-08 21:42:13 -0500 | [diff] [blame] | 158 | rev = pr |
| 159 | |
| 160 | if pr.kvStore != nil { |
| 161 | blobMap, _ := pr.kvStore.List(path) |
| 162 | |
| 163 | partition := strings.SplitN(path, "/", 2) |
| 164 | name := partition[0] |
| 165 | |
| 166 | if len(partition) < 2 { |
| 167 | path = "" |
Stephane Barbarie | 4a2564d | 2018-07-26 11:02:58 -0400 | [diff] [blame] | 168 | } else { |
Stephane Barbarie | 1ab4327 | 2018-12-08 21:42:13 -0500 | [diff] [blame] | 169 | path = partition[1] |
| 170 | } |
| 171 | |
| 172 | field := ChildrenFields(rev.GetBranch().Node.Type)[name] |
| 173 | |
| 174 | if field.IsContainer { |
| 175 | for _, blob := range blobMap { |
| 176 | output := blob.Value.([]byte) |
| 177 | |
| 178 | data := reflect.New(field.ClassType.Elem()) |
| 179 | |
| 180 | if err := proto.Unmarshal(output, data.Interface().(proto.Message)); err != nil { |
| 181 | // TODO report error |
| 182 | } else { |
| 183 | |
| 184 | var children []Revision |
| 185 | |
| 186 | if path == "" { |
| 187 | if field.Key != "" { |
| 188 | // e.g. /logical_devices/abcde --> path="" name=logical_devices key=abcde |
| 189 | if field.Key != "" { |
Stephane Barbarie | 3cb0122 | 2019-01-16 17:15:56 -0500 | [diff] [blame] | 190 | children = make([]Revision, len(rev.GetChildren(name))) |
| 191 | copy(children, rev.GetChildren(name)) |
Stephane Barbarie | 1ab4327 | 2018-12-08 21:42:13 -0500 | [diff] [blame] | 192 | |
| 193 | _, key := GetAttributeValue(data.Interface(), field.Key, 0) |
| 194 | |
| 195 | childRev := rev.GetBranch().Node.MakeNode(data.Interface(), txid).Latest(txid) |
| 196 | childRev.SetHash(name + "/" + key.String()) |
Stephane Barbarie | e0a4c79 | 2019-01-16 11:26:29 -0500 | [diff] [blame] | 197 | |
| 198 | // Create watch for <component>/<key> |
| 199 | pr.SetupWatch(childRev.GetHash()) |
| 200 | |
Stephane Barbarie | 1ab4327 | 2018-12-08 21:42:13 -0500 | [diff] [blame] | 201 | children = append(children, childRev) |
| 202 | rev = rev.UpdateChildren(name, children, rev.GetBranch()) |
| 203 | |
| 204 | rev.GetBranch().Node.makeLatest(rev.GetBranch(), rev, nil) |
| 205 | |
| 206 | response = append(response, childRev) |
| 207 | continue |
| 208 | } |
| 209 | } |
| 210 | } else if field.Key != "" { |
| 211 | // e.g. /logical_devices/abcde/flows/vwxyz --> path=abcde/flows/vwxyz |
| 212 | |
| 213 | partition := strings.SplitN(path, "/", 2) |
| 214 | key := partition[0] |
| 215 | if len(partition) < 2 { |
| 216 | path = "" |
| 217 | } else { |
| 218 | path = partition[1] |
| 219 | } |
| 220 | keyValue := field.KeyFromStr(key) |
| 221 | |
Stephane Barbarie | 3cb0122 | 2019-01-16 17:15:56 -0500 | [diff] [blame] | 222 | children = make([]Revision, len(rev.GetChildren(name))) |
| 223 | copy(children, rev.GetChildren(name)) |
Stephane Barbarie | 1ab4327 | 2018-12-08 21:42:13 -0500 | [diff] [blame] | 224 | |
| 225 | idx, childRev := rev.GetBranch().Node.findRevByKey(children, field.Key, keyValue) |
| 226 | |
| 227 | newChildRev := childRev.LoadFromPersistence(path, txid) |
| 228 | |
| 229 | children[idx] = newChildRev[0] |
| 230 | |
Stephane Barbarie | 3cb0122 | 2019-01-16 17:15:56 -0500 | [diff] [blame] | 231 | rev := rev.UpdateChildren(name, rev.GetChildren(name), rev.GetBranch()) |
Stephane Barbarie | 1ab4327 | 2018-12-08 21:42:13 -0500 | [diff] [blame] | 232 | rev.GetBranch().Node.makeLatest(rev.GetBranch(), rev, nil) |
| 233 | |
| 234 | response = append(response, newChildRev[0]) |
| 235 | continue |
| 236 | } |
| 237 | } |
Stephane Barbarie | 4a2564d | 2018-07-26 11:02:58 -0400 | [diff] [blame] | 238 | } |
| 239 | } |
| 240 | } |
Stephane Barbarie | 1ab4327 | 2018-12-08 21:42:13 -0500 | [diff] [blame] | 241 | return response |
Stephane Barbarie | 4a2564d | 2018-07-26 11:02:58 -0400 | [diff] [blame] | 242 | } |
Stephane Barbarie | ec0919b | 2018-09-05 14:14:29 -0400 | [diff] [blame] | 243 | |
Stephane Barbarie | dc5022d | 2018-11-19 15:21:44 -0500 | [diff] [blame] | 244 | // UpdateData modifies the information in the data model and saves it in the persistent storage |
Stephane Barbarie | ec0919b | 2018-09-05 14:14:29 -0400 | [diff] [blame] | 245 | func (pr *PersistedRevision) UpdateData(data interface{}, branch *Branch) Revision { |
Stephane Barbarie | e0a4c79 | 2019-01-16 11:26:29 -0500 | [diff] [blame] | 246 | log.Debugw("updating-persisted-data", log.Fields{"hash": pr.GetHash()}) |
| 247 | |
Stephane Barbarie | ec0919b | 2018-09-05 14:14:29 -0400 | [diff] [blame] | 248 | newNPR := pr.Revision.UpdateData(data, branch) |
| 249 | |
| 250 | newPR := &PersistedRevision{ |
| 251 | Revision: newNPR, |
| 252 | Compress: pr.Compress, |
khenaidoo | b920354 | 2018-09-17 22:56:37 -0400 | [diff] [blame] | 253 | kvStore: pr.kvStore, |
Stephane Barbarie | ec0919b | 2018-09-05 14:14:29 -0400 | [diff] [blame] | 254 | } |
| 255 | |
Stephane Barbarie | ec0919b | 2018-09-05 14:14:29 -0400 | [diff] [blame] | 256 | return newPR |
| 257 | } |
| 258 | |
Stephane Barbarie | dc5022d | 2018-11-19 15:21:44 -0500 | [diff] [blame] | 259 | // UpdateChildren modifies the children of a revision and of a specific component and saves it in the persistent storage |
Stephane Barbarie | ec0919b | 2018-09-05 14:14:29 -0400 | [diff] [blame] | 260 | func (pr *PersistedRevision) UpdateChildren(name string, children []Revision, branch *Branch) Revision { |
Stephane Barbarie | e0a4c79 | 2019-01-16 11:26:29 -0500 | [diff] [blame] | 261 | log.Debugw("updating-persisted-children", log.Fields{"hash": pr.GetHash()}) |
| 262 | |
Stephane Barbarie | ec0919b | 2018-09-05 14:14:29 -0400 | [diff] [blame] | 263 | newNPR := pr.Revision.UpdateChildren(name, children, branch) |
| 264 | |
| 265 | newPR := &PersistedRevision{ |
| 266 | Revision: newNPR, |
| 267 | Compress: pr.Compress, |
khenaidoo | b920354 | 2018-09-17 22:56:37 -0400 | [diff] [blame] | 268 | kvStore: pr.kvStore, |
Stephane Barbarie | ec0919b | 2018-09-05 14:14:29 -0400 | [diff] [blame] | 269 | } |
| 270 | |
Stephane Barbarie | ec0919b | 2018-09-05 14:14:29 -0400 | [diff] [blame] | 271 | return newPR |
| 272 | } |
| 273 | |
Stephane Barbarie | dc5022d | 2018-11-19 15:21:44 -0500 | [diff] [blame] | 274 | // UpdateAllChildren modifies the children for all components of a revision and saves it in the peristent storage |
Stephane Barbarie | ec0919b | 2018-09-05 14:14:29 -0400 | [diff] [blame] | 275 | func (pr *PersistedRevision) UpdateAllChildren(children map[string][]Revision, branch *Branch) Revision { |
Stephane Barbarie | e0a4c79 | 2019-01-16 11:26:29 -0500 | [diff] [blame] | 276 | log.Debugw("updating-all-persisted-children", log.Fields{"hash": pr.GetHash()}) |
| 277 | |
Stephane Barbarie | ec0919b | 2018-09-05 14:14:29 -0400 | [diff] [blame] | 278 | newNPR := pr.Revision.UpdateAllChildren(children, branch) |
| 279 | |
| 280 | newPR := &PersistedRevision{ |
| 281 | Revision: newNPR, |
| 282 | Compress: pr.Compress, |
khenaidoo | b920354 | 2018-09-17 22:56:37 -0400 | [diff] [blame] | 283 | kvStore: pr.kvStore, |
Stephane Barbarie | ec0919b | 2018-09-05 14:14:29 -0400 | [diff] [blame] | 284 | } |
| 285 | |
Stephane Barbarie | ec0919b | 2018-09-05 14:14:29 -0400 | [diff] [blame] | 286 | return newPR |
| 287 | } |
Stephane Barbarie | 88fbe7f | 2018-09-25 12:25:23 -0400 | [diff] [blame] | 288 | |
| 289 | // Drop takes care of eliminating a revision hash that is no longer needed |
| 290 | // and its associated config when required |
| 291 | func (pr *PersistedRevision) Drop(txid string, includeConfig bool) { |
Stephane Barbarie | e0a4c79 | 2019-01-16 11:26:29 -0500 | [diff] [blame] | 292 | log.Debugw("dropping-revision", |
| 293 | log.Fields{"txid": txid, "hash": pr.GetHash(), "config-hash": pr.GetConfig().Hash, "stack": string(debug.Stack())}) |
| 294 | |
Stephane Barbarie | dc5022d | 2018-11-19 15:21:44 -0500 | [diff] [blame] | 295 | pr.mutex.Lock() |
| 296 | defer pr.mutex.Unlock() |
Stephane Barbarie | 88fbe7f | 2018-09-25 12:25:23 -0400 | [diff] [blame] | 297 | if pr.kvStore != nil && txid == "" { |
Stephane Barbarie | 3cb0122 | 2019-01-16 17:15:56 -0500 | [diff] [blame] | 298 | if pr.isStored { |
| 299 | if includeConfig { |
| 300 | if err := pr.kvStore.Delete(pr.GetConfig().Hash); err != nil { |
| 301 | log.Errorw("failed-to-remove-revision-config", log.Fields{"hash": pr.GetConfig().Hash, "error": err.Error()}) |
| 302 | } |
| 303 | } |
| 304 | |
| 305 | if err := pr.kvStore.Delete(pr.GetHash()); err != nil { |
| 306 | log.Errorw("failed-to-remove-revision", log.Fields{"hash": pr.GetHash(), "error": err.Error()}) |
| 307 | } else { |
| 308 | pr.isStored = false |
| 309 | } |
| 310 | |
| 311 | if pr.isWatched { |
| 312 | pr.kvStore.DeleteWatch(pr.GetHash(), pr.events) |
| 313 | pr.isWatched = false |
Stephane Barbarie | 88fbe7f | 2018-09-25 12:25:23 -0400 | [diff] [blame] | 314 | } |
| 315 | } |
| 316 | |
Stephane Barbarie | 88fbe7f | 2018-09-25 12:25:23 -0400 | [diff] [blame] | 317 | } else { |
| 318 | if includeConfig { |
Stephane Barbarie | e0a4c79 | 2019-01-16 11:26:29 -0500 | [diff] [blame] | 319 | log.Debugw("attempted-to-remove-transacted-revision-config", log.Fields{"hash": pr.GetConfig().Hash, "txid": txid}) |
Stephane Barbarie | 88fbe7f | 2018-09-25 12:25:23 -0400 | [diff] [blame] | 320 | } |
Stephane Barbarie | e0a4c79 | 2019-01-16 11:26:29 -0500 | [diff] [blame] | 321 | log.Debugw("attempted-to-remove-transacted-revision", log.Fields{"hash": pr.GetHash(), "txid": txid}) |
Stephane Barbarie | 88fbe7f | 2018-09-25 12:25:23 -0400 | [diff] [blame] | 322 | } |
Stephane Barbarie | dc5022d | 2018-11-19 15:21:44 -0500 | [diff] [blame] | 323 | |
| 324 | pr.Revision.Drop(txid, includeConfig) |
Stephane Barbarie | 88fbe7f | 2018-09-25 12:25:23 -0400 | [diff] [blame] | 325 | } |