Skip to content

Commit 147c7a3

Browse files
Merge pull request #1521 from memphisdev/bugfix-RND-346-side-station-dls-no-attached-side-dls-station-while-user-using-in-station-name-with-special-characters
fix
2 parents 80c554f + 381d068 commit 147c7a3

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

server/memphis_handlers_stations.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -436,8 +436,9 @@ func (s *Server) createStationDirectIntern(c *client,
436436
return
437437
}
438438

439+
dlsStationNameToLower := strings.ToLower(csr.DlsStation)
439440
if csr.DlsStation != "" {
440-
DlsStation, err := StationNameFromStr(csr.DlsStation)
441+
DlsStation, err := StationNameFromStr(dlsStationNameToLower)
441442
if err != nil {
442443
serv.Warnf("[tenant: %v][user:%v]createStationDirect at StationNameFromStr: Station %v: %v", csr.TenantName, csr.Username, csr.DlsStation, err.Error())
443444
jsApiResp.Error = NewJSStreamCreateError(err)
@@ -452,7 +453,7 @@ func (s *Server) createStationDirectIntern(c *client,
452453
}
453454
if !exist {
454455
var created bool
455-
dlsStationName, err := StationNameFromStr(csr.DlsStation)
456+
dlsStationName, err := StationNameFromStr(dlsStationNameToLower)
456457
if err != nil {
457458
serv.Errorf("[tenant: %v][user:%v]createStationDirect at DLS StationNameFromStr: %v", csr.TenantName, csr.Username, err.Error())
458459
respondWithErr(s.MemphisGlobalAccountString(), s, reply, err)
@@ -520,7 +521,7 @@ func (s *Server) createStationDirectIntern(c *client,
520521
}
521522
}
522523

523-
newStation, rowsUpdated, err := db.InsertNewStation(stationName.Ext(), user.ID, user.Username, retentionType, retentionValue, storageType, replicas, schemaDetails.SchemaName, schemaDetails.VersionNumber, csr.IdempotencyWindow, isNative, csr.DlsConfiguration, csr.TieredStorageEnabled, user.TenantName, partitionsList, 2, csr.DlsStation)
524+
newStation, rowsUpdated, err := db.InsertNewStation(stationName.Ext(), user.ID, user.Username, retentionType, retentionValue, storageType, replicas, schemaDetails.SchemaName, schemaDetails.VersionNumber, csr.IdempotencyWindow, isNative, csr.DlsConfiguration, csr.TieredStorageEnabled, user.TenantName, partitionsList, 2, dlsStationNameToLower)
524525
if err != nil {
525526
if !strings.Contains(err.Error(), "already exist") {
526527
serv.Errorf("[tenant: %v][user:%v]createStationDirect at InsertNewStation: Station %v: %v", csr.TenantName, csr.Username, csr.StationName, err.Error())

0 commit comments

Comments
 (0)